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

Change-Id: I62547abde56106bb002a1bdd1e5b163c037db910