Merge Android 12 QPR1

Bug: 210511427
Merged-In: I4517f8cd3491de8bbc11cc57512220bc9a18b3c5
Change-Id: Ifbf8e03d0302f3b019fc370866da553200be0411