Merge "[automerger skipped] Disable warning for kernel 6.5 update. am: e4f0baa268 -s ours am: e2dac88019 -s ours" into udc-dev-plus-aosp