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

Change-Id: I13a8dbf304664f8eb6f0faa28c06846445352ebd