Android platform 12.0.0 release 22
Merge cherrypicks of [17008939] into sc-platform-release.

Change-Id: Ia7d793a0e7e2b1cbaf4f9df6a4b6c3eee414f32a