Merge Android 12

Bug: 202323961
Merged-In: I3f26c7349bb46ddd70b75527102babac5d328f8a
Change-Id: I5b3fa37f2042771b44aae2ec0f5c4cd6e1417167