Merge Android 12

Bug: 202323961
Merged-In: I9005a2833ba6df815b108ff213286afca56df475
Change-Id: Ic9318c9831bc4f5295c01d76d2f8325feb00b3b8