Merge Android 12

Bug: 202323961
Merged-In: I304299133d16934b75e9c7d11cacc15ea20b8ea6
Change-Id: I060490abdb4e82e5b80d3571c7ac92c35a545fe2