Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ia3c74479d7024c839926e9f6f4524f255bd712f4
Change-Id: I41440e09ca12156a7210351ecab8af9a2e61ac7f