Merge Android 12

Bug: 202323961
Merged-In: If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d
Change-Id: I9590521a5812d9f15badef793991c4c4a85809ff