Merge branch 'android12-5.10' into `android12-5.10-lts`

Sync up with android12-5.10 for the following commits:

43223c8e ANDROID: GKI: update .xml file after xhci bugfix
34f6c9c3 ANDROID: usb: host: fix slab-out-of-bounds in xhci_vendor_get_ops

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I470e83dac326c4ba0414f1f07260896d4d233e66