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

Change-Id: If7b380110a47d63e8fded9f5269e435d5d64b0e0