Merge Android 12

Bug: 202323961
Merged-In: Ic0b62464a326d6a7b6afd823414c6c8fd0d67547
Change-Id: Ib6efaff3d74a904678d75922aa91d7824ced594b