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

Change-Id: I285c00b9ae2f82ab2a8888db95561c2e9cd69c93