Android Platform 12.1.0 Release 6 (SPM2.220610.003)
Merge cherrypicks of [18492389] into sc-v2-platform-release.

Change-Id: I8e69d77ae67be1ad0263ae2ff342e333aac3e7a6