[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am: fce6b1f4d2 -s ours

am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189

Change-Id: I146e4bebc0e8784dca3d5105e8b6b8993008b325