Android platform 12.1.0 release 11
Merge cherrypicks of [19214732] into sc-v2-platform-release.

Change-Id: Ib632e0245c764a63076bdf7d34b4aeeb2c2e893f