Merge from main-R121-cos-6.6 to release-R121-cos-6.6

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