Merge Android 12

Bug: 202323961
Merged-In: I18fafce9c9c2f412a44dcf9455d886c398c8011a
Change-Id: Ie0bfc70d62059cae89f7c240d9ebc97e81175180