Merge Android 12

Bug: 202323961
Merged-In: Iaedd5c47eba04a0a36fe2dc383d5f28de2c170fb
Change-Id: Iaf44757df92cd962fb9183c86027d90de9508b93