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

Change-Id: I3da4f48e7ae8ae9ba8caec274556ffa971fc3d43