Merge Android 12L

Bug: 222710654
Merged-In: I809f4aa2beed0fe9cfd7fb7e5ccde1cac73c1a13
Change-Id: I72c07ddf615acc1a8b1cae9fe14b28c05d51b3cd