Android platform 11.0.0 release 34
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22629683', 'googleplex-android-review.googlesource.com/22600497'] into rvc-platform-release.

Change-Id: Ic87a4cba02192c835aa7f33b52d0f2b6bc72aa68