Merge Android 12

Bug: 202323961
Merged-In: Ia94ba56e0bbafb3e027c719b8a24a40a737a2d9f
Change-Id: I519541ff793fafd03018ff012fca0387e553e08f