Merge Android 12

Bug: 202323961
Merged-In: Ia96b39cc2cea72949f10593952abfb9f9901d682
Change-Id: I2feac8f91c7b6cbf032fd3c4ca519fd2ae8e6657