Merge Android 12 QPR1

Bug: 210511427
Merged-In: I325e71d4f7ba1fbf8dfbe2c7dff3067520a799fd
Change-Id: I13c9d041415ec5ad5181a039cbde6baa03cb2979