Merge Android 12L

Bug: 222710654
Merged-In: Ib3c04789b21fe8cc7c4508779cfe1c251f56c305
Change-Id: I7868792ad2a34da4323e53be6aa00e5c94266f99