Merge Android 12

Bug: 202323961
Merged-In: Iccee4ffe208d24468016c890d7eb0119c0773045
Change-Id: I111fe941eab1e3415c48132916564772a150ff6c