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

Change-Id: Icf785f6fcbfec66546d7a744294af20a322f4c74