Android platform 12.0.0 release 5
Merge cherrypicks of [16616068] into sc-platform-release.

Change-Id: Ic3680070e4fbbe5b6e7ff36ca6ea8a066c99e27f