Merge Android 12

Bug: 202323961
Merged-In: I5c53eaff7cad32bd5879dfb7a66690425c8be912
Change-Id: If7d8cfa6b79b38112a786734a02367ef3dd46dd0