Merge Android 12 QPR1

Bug: 210511427
Merged-In: I7361e4335701c8bdb13f817ecdc1530830eb86e0
Change-Id: I179a7841b24a81bc566f97b6b2b1a0b9604aae6d