Android platform 12.0.0 release 17
Merge cherrypicks of [20028194] into sc-platform-release.

Change-Id: I2e0931fdbecb5cf52f70ba6da99c351a9c73e441