Android Platform 12.0.0 Release 12 (8968633)
Merge cherrypicks of [19419128, 19459610] into sc-platform-release.

Change-Id: Ife07734e620c10cfa080d80d3d3db82ed941ce9a