Android platform 12.0.0 release 13
Merge cherrypicks of [19370567, 19868792] into sc-platform-release.

Change-Id: Iebe77c0e9f2111ebf96312d669ef3f7db76127a6