Merge Android 12 QPR1

Bug: 210511427
Merged-In: I043307a41b07b6a29d680f482b7d786e4d4e8ba5
Change-Id: I75c485b1af25f0bc14ba786546f23cc12486ae33