Android platform 12.0.0 release 13
Merge cherrypicks of [19606017] into sc-platform-release.

Change-Id: I765c7a3419567080c92c8d2f4206147edb00a634