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

Change-Id: I034c242b1610e723a5907448368b47e4bc2d8a91