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

Change-Id: I286d45064efb28e8acef82641fd4d10275149137