Merge "Revert "Update to v5.18 kernel headers."" am: 6cfefe5842

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2106941

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