Android Platform 12.0.0 Release 16 (SPM1.220819.020)
Merge cherrypicks of ['ag/20419566'] into sc-platform-release.

Change-Id: Ida718628f991d14ad470748d92c479d8020496ba