Merge "Update for kernel 6.1 headers." am: 591609c755 am: a5857396e1

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2343951

Change-Id: I6f293f32580eb98df5cbe0ae8057a287d543c250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>