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

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

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