Merge Android 12 QPR1

Bug: 210511427
Merged-In: I866620023981c86c4443f57758bbb3e8e852731a
Change-Id: Id1dcff4a8bee0135df1c6d6734067d82f1ffe092