Merge Android 12L

Bug: 222710654
Merged-In: Idd44decd57c2677d8f771d5d8d92ea019ee014b9
Change-Id: I6c0752f5e5203ada04ede8c98d784b30c0ea0963