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

Change-Id: Ic140e2e2d748895aab5ef380d63d0dff840b3b06