Android platform 11.0.0 release 30
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21120805'] into rvc-platform-release.

Change-Id: Ie70f0ca255fa95a6e6b61646c882022c3632aaff