Merge Android 12 QPR1

Bug: 210511427
Merged-In: I2b0b83ee7aee731031ebb4f18d476a39bf3e11d5
Change-Id: I58cdd42675542d875b1fee06777d1bbd836e2192