Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ic4403e3a9fbe9d9bf04cfe5549bb0e580ccedb2e
Change-Id: I7b1571a807d8e9f1ddbafc677f2ed8b8d8bd693d