Android platform 12.0.0 release 15
Merge cherrypicks of [20068332] into sc-platform-release.

Change-Id: Ib32c8aa78210c34276e53c9092b1348403f8c00f