Merge Android 12L

Bug: 222710654
Merged-In: I41b0f264d344daeb60050231160084c448083f16
Change-Id: I9eef041d2c53ec22da3c85cd61df666d9b7c2e49