Merge Android 12L

Bug: 222710654
Merged-In: Idbaf1b02ce8c1bcf2f4974a17294b4f674e49f48
Change-Id: I346065b59b81d5502f235a516c72731505a90a2b