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

Change-Id: I0de0ae9964bac00105a6d5e25ebc320eaab1576f