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

Change-Id: I799e3254e1603f0d3e7d0dcd118afc4b701ca62c