Android 12.0.0 release 20
Merge cherrypicks of [16087108] into sc-qpr1-d-release.

Change-Id: Ibcf7f0bcbd1c954d583a84de0a27625138a74d6d