Merge Android 12L

Bug: 222710654
Merged-In: I513aa15f5d655ac3fbb535797659d3654ccfec5e
Change-Id: I0e4553be8788fcb5ca9e9d534ed47ac82b52a427