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

Change-Id: I38e57a78bba530248565a560e23c16c8f0ce5520