Merge Android 12

Bug: 202323961
Merged-In: I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5
Change-Id: I0ddfad6880654b9b22b218d5a1bed41ea3e149f6