Merge Android 12 QPR1

Bug: 210511427
Merged-In: I20a17a23ad4911b6d76e2782c4f394890997d32e
Change-Id: I2a2796745ffb928a333741bdbec63b5cabf69398