Merge Android 12L

Bug: 222710654
Merged-In: I2bf469307acd968bf4faa789a9325173d6351c1d
Change-Id: If133e68387a29411cfc08be9e616388fc65896d7