Merge Android 12L

Bug: 222710654
Merged-In: I96e0543efbc16731b1a14f77c7c314bb518e71e7
Change-Id: Ib109872926474d9b7bd0538bb236b4700261c6ce