Android 12.0.0 release 19
Merge cherrypicks of [16105251] into sc-qpr1-d-release.

Change-Id: I12e9b9d31cffde5c38341457df041c56fc90882a