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

Change-Id: I13aaa44b311dba3327ff37052cb261d544851773