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

Change-Id: I963cce28adf85bf7e27131eae14aec9ebd7db51b