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

Change-Id: Ib8cdd8407322e741bb9874312f623f6ba2253470