Android Platform 12.1.0 Release 10 (SPM2.220819.013)
Merge cherrypicks of [20272752] into sc-v2-platform-release.

Change-Id: I2b9414754631054734b34122be0f0d718ebf32d3