Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ib4c2882c506f8c3f35dc2d5616f4986ee30cfdcb
Change-Id: I4f053c1853903e87c61080a62d994ffe08920fef