Merge Android 12L

Bug: 222710654
Merged-In: I1d3b32663167d200c4aad5f9fac0b52d3ddde5c2
Change-Id: I6d758b12cbc1de581ccb27680b7b56264a289852