Merge Android 12

Bug: 202323961
Merged-In: I6c74f839d52db5c68812229a08b585ad416d5fed
Change-Id: I73dcd6fa78340f83324fdec050a137ef7007f069