Merge Android 12L

Bug: 222710654
Merged-In: I33dbff12e154a0eefcc278fa3feb2f28936fe37b
Change-Id: I4c273da7460b1a9c14257bf09e5cd674e6aa889e