Merge Android 12L

Bug: 222710654
Merged-In: I22c51a0303fa4be5f3cf0208b74b2cca0c1f951c
Change-Id: I7acec8db4e5ed791c7eb72c93e12349282a94641