Merge Android 12

Bug: 202323961
Merged-In: Iee14e064c00685d832860de7590d221d553ca3f1
Change-Id: If74b0ce749350ec32ff5eb8898cd3c196bf2f064