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

Change-Id: I14798fdabfe79810602b62b95fc2b067e5c6170b