Android platform 12.0.0 release 11
Merge cherrypicks of [18993507] into sc-platform-release.

Change-Id: If2b57da27b0c90269903470504294c0e3d8ddba4