Merge Android 12

Bug: 202323961
Merged-In: Icd70009f62d023fb68bb1355f804f9489362c0ed
Change-Id: I7fbd1b2ee2ba72e90ce098f235f2f7a927898c09