Merge Android 12L

Bug: 222710654
Merged-In: I8b1787d54907dd3ef3dca2e6c9483893c4e73f7d
Change-Id: I2bfdf4e169321347d277e30e78aabb7dd1c556f6