Merge Android 12

Bug: 202323961
Merged-In: I57b9f2ce2d5e18f5c1bf8203c266ce0c8f5e7be0
Change-Id: I23c3dd218039f635e7b1e4ae4bf441afc80d5d52