Android Platform 12.0.0 Release 30 (SPM1.220819.059)
Merge cherrypicks of ['ag/20639573'] into sc-platform-release.

Change-Id: I66dae736930f4c737b545953704dc0d22218b34a