Merge Android 12L

Bug: 222710654
Merged-In: Ie1096b4480b9b67a9d85e44b60a1844e5f8de4b3
Change-Id: I1ebabbcb937c5eb2fb6922e5146ffab1c522e56f