Merge Android 12

Bug: 202323961
Merged-In: I291da39a81666a7bbd001a685d1db12c84e4d31c
Change-Id: If480657962daa2337bd215a4af6f226d4a711213