Android Platform 11.0.0 Release 29 (RPM1.220718.027)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20659353'] into rvc-platform-release.

Change-Id: I3b25368e9eeb23ab8296b9655dfc88dff64a1e23