Merge Android 12

Bug: 202323961
Merged-In: I8ddbe0c5ee40d4b4cd6190f63cf9339a1d914f2c
Change-Id: I907093fa952dc44812a8d6a0293ad89cb95b7415