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

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