Android platform 11.0.0 release 38
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24872615', 'googleplex-android-review.googlesource.com/25096450'] into rvc-platform-release.

Change-Id: Ia7184abd13eb665529d20f76ea3a6865267b6bbb