Android Platform 11.0.0 Release 39 (RPM1.220718.057)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25444057'] into rvc-platform-release.

Change-Id: Ie209285794c1341488f8d474f55a28501861197e