Merge from main-R129-cos-6.12 to release-R129-cos-6.12

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