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

Change-Id: If40e199fb9d96869d3d567e773e4a94046ca68a7