Merge Android 12

Bug: 202323961
Merged-In: Ifea01915497482aeee896bdc7972a717397635ae
Change-Id: I5a69e0be4c64263c6c18dd877ab12e243c63bb82