Android Platform 12.0.0 Release 30 (SPM1.220819.059)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24589031'] into sc-platform-release.

Change-Id: I2234466157ae596dcf6d8253d996f43f29d7dfee