Merge Android 12L

Bug: 222710654
Merged-In: I7914ce0266c443adf0f189c4971f6d036ed8b420
Change-Id: I550dc397605c2ba47f0ccc05cd7888862a0c4e3a