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

Change-Id: Ia93ee4fee7728f14e0d20a3a843016cf0d20736c