Merge Android 12

Bug: 202323961
Merged-In: Ibca7e25968decd95cdc4c54b12239976d6762e49
Change-Id: I94734acf08f2b62e695d4771dcaa0afabec7a33b