Merge Android 12

Bug: 202323961
Merged-In: I99298dfa8fc439e6f7f016cadeb7841be0f25665
Change-Id: I1c6219a5b31490801b8b845d006006a0f38978ac