Merge Android 12L

Bug: 222710654
Merged-In: Ib1552db7927c8f588485866121a5af3cfc159d79
Change-Id: Icfc355f7275e9fcd2550fceac11c6f07aad59217