Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ibbb8a2b22e12c685a336c3664a3dc85852293feb
Change-Id: I7cf063e7f9e4a841d1f34f8a442993f1a9ab4b53