Merge Android 12L

Bug: 222710654
Merged-In: I50e66aec0482fa5b77cf4da0e115ae59d9dad212
Change-Id: I62cf6e0701eed8013052da4e51386ec1406e1545