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

Change-Id: I3e17efd0b3eee0a814ac035693694ce8245511bc