Android 12.0.0 Release 29 (SQ1D.220205.003)
Merge cherrypicks of [16373492] into sc-qpr1-d-release.

Change-Id: I08b1cd88e533c042514a1054272d2756084cb283