Merge Android 12L

Bug: 222710654
Merged-In: I12eec8d7027f6b175826017e35b0d4b9375ea195
Change-Id: I3ce84f254066700bfa34b849ecdd46d88638d8fe