Merge Android 12

Bug: 202323961
Merged-In: I05e4aa3a0ce2a4412547246cfe28841bd54aac4c
Change-Id: I190c0067d7fec61a7890c3a7c9e08c3d8ab79319