Merge Android 12L

Bug: 222710654
Merged-In: Icf2fc4009ea09a16967d96bf163ed295c1da94c3
Change-Id: I5a50d6b21bab6ec0a6813cbf3035f17e8756cf41