Android platform 12.0.0 release 9
Merge cherrypicks of [17806584] into sc-platform-release.

Change-Id: I79bd6b4b4171e40682533e27292394c15df6541e