Android Platform 12.1.0 Release 24 (SPM2.220819.047)
Merge cherrypicks of ['ag/20330539'] into sc-v2-platform-release.

Change-Id: Ie340401296d2f76ac76addc679d819f16d526e3f