Android platform 12.1.0 release 13
Merge cherrypicks of [19085840] into sc-v2-platform-release.

Change-Id: Ia5656cc93ecea93e0f15c6b5f87999564489a3f1