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

Change-Id: I905db5999afbb46176e6e625d2f6765dc354528a