Merge Android 12L

Bug: 222710654
Merged-In: I68c31f5fafc31f74d2c10a99fde3d0a4ff961002
Change-Id: I67a95c4a82548e24d2792aef15a01642106f5c77