Merge Android 12

Bug: 202323961
Merged-In: Ibf274d5809120d2ca58dd35865d8ec0a76b9925a
Change-Id: I9d6d70c48b25643bbab824ee634199a9dcf5cc8f