Merge Android 12

Bug: 202323961
Merged-In: I407dc43fc27a6804ffbf1b0433fcd3a0734db6a3
Change-Id: I7a64c4290fe2a47269744661fcce860ed8d07a97