Merge Android 12

Bug: 202323961
Merged-In: Ife37bccc1772b793e935f93d806526c20aa46d93
Change-Id: I44ab2ba9dc3d47d142f695b3a77d49c2ca6bf24e