Merge Android 12

Bug: 202323961
Merged-In: Ib18020388a4609045e4e0138f8671c7ef1a5457b
Change-Id: I1e4a688b26d0c90ca189c88dff840334b711724c