Android Platform 12.0.0 Release 10 (SPM1.220111.009)
Merge cherrypicks of [18492389] into sc-platform-release.

Change-Id: I9a90a9254c66b8a96825a5ba2e9c0e88fb985944