Merge Android 12 QPR1

Bug: 210511427
Merged-In: I904aadc2fbbb180b57c1b7ff6454dbf0e510b38d
Change-Id: I2d48eac90735298944ff90253b97eb62a62a15a0