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

Change-Id: Iaf0bff499b147c4e32f4e604deb2086d48adafe6