Merge Android 12

Bug: 202323961
Merged-In: If40b13f6263a3c0123916bb95a987505e78767a2
Change-Id: Ic22e01134ea6a572fccb9b1535cbe73be03489d4