Android Platform 12.0.0 Release 26 (11065285)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23982017', 'googleplex-android-review.googlesource.com/24301338'] into sc-platform-release.

Change-Id: I76062fe8db4467645dfe3f8579d8fb73bd9bb0f0