Merge Android 12L

Bug: 222710654
Merged-In: Ia6c46f2de07731b0e423da6bb32a27b8c1bbe171
Change-Id: Ia65e634d559b9ddc3eb9d4dccec9b9358648dddb