Android Platform 12.1.0 Release 12 (SPM2.220819.017)
Merge cherrypicks of [18670817] into sc-v2-platform-release.

Change-Id: I3d985ea17ff8330322acd1b7828ed11f5b2274c9