Merge Android 12

Bug: 202323961
Merged-In: If0a2b824f3f1d1e1052eda860e2a58106406118b
Change-Id: Ief33d25804d467288f8feb14dff066e52b4db806