Merge Android 12L

Bug: 222710654
Merged-In: I793eee4a4e8c2f9aeb4163e72f970e1b7b5a73ea
Change-Id: I9040a7958757530714f60bba6ecf1af6f7ff572c