Merge Android 12 QPR1

Bug: 210511427
Merged-In: I44aeb5efa20e20939d76eb8eb8d933a877ddca09
Change-Id: Iabe8c945779f661fc0a9c356d30af980256cad9a