Merge Android 12

Bug: 202323961
Merged-In: I95928fddc96f3a90e2ae935e9ccd6229801471d1
Change-Id: I5b3c094df6ddac36e784ab8efcfe6dee3e16f3bf