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

Change-Id: If4066221a4b870dba09076e7e14580528e4f7fef