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

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