Android 12.0.0 Release 32 (SQ1D.220205.004)
Merge cherrypicks of [16074852, 16074853] into sc-qpr1-d-release.

Change-Id: I32fadccbc4b159436b3e631e762d070843077608