Merge Android 12L

Bug: 222710654
Merged-In: Idc284bc85f8f701a75e4dea96ff7fbe049734f9e
Change-Id: I6787c5a6bbf222c671235ee727c846f2a491e351