Merge Android 12

Bug: 202323961
Merged-In: Id666e2793d42ad6028265fa340ecf4e75ed5a5b5
Change-Id: I6c8ae46410c19cec8a48c353f4de8a0ec4669a7c