Merge Android 12

Bug: 202323961
Merged-In: Id5f58e8cb24bcba19ec2253a9ca5d0703a54b43b
Change-Id: I0aef63344daf978b35157528bd0caac37405d3e8