Android platform 12.0.0 release 17
Merge cherrypicks of ['ag/20758566'] into sc-platform-release.

Change-Id: I025dece295312eaf52d86b4b6eccce6bca254c0b