Merge from main-R133-cos-6.18 to release-R133-cos-6.18

Change-Id: I05f57182261c6bb206ef8b8b57781b1c8d68d486
Signed-off-by: COS Cherry Picker <cloud-image-release@prod.google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/231091