Merge Android 12

Bug: 202323961
Merged-In: I81bde134c6eb6c528640b5c4f4e7da926cb6f8a3
Change-Id: I5fc2d052864fa7f9cb223f3ee3ca02d8640aae7e