Merge Android 12

Bug: 202323961
Merged-In: Id2b77e99757ad1f6a702b5abd2a15d27f25013c8
Change-Id: I0d2ce08da17dbe91b78785e27906e498ebacf198