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

Change-Id: I15e9bd7a7fb1743a53c28fadb5e53affd4b8ad2a