Merge Android 12

Bug: 202323961
Merged-In: I793b678232ad2a620eb137cb1640b89ff351f455
Change-Id: I4f5a0cc78e923323fe090c003c2fc78ec14039c2