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

Change-Id: If18ae90f111df8e222d21488e448da42c0cf6c85