Android platform 12.1.0 release 9
Merge cherrypicks of [19774786] into sc-v2-platform-release.

Change-Id: Ie697de488f8f576eb532453c173e89e425cf8ca6