Merge Android 12

Bug: 202323961
Merged-In: I5cd8ed57adca2a94eafd78a73a82e3c495846a29
Change-Id: I76f7416e711e5164143de4f0573b6b682d9f4161