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

Change-Id: I1b1058dccb18618795c14c01477170f2e3b3b8c4