[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am: 7d057913a0 -s ours

am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history

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

Change-Id: I7f7c03c4cf5fc75273233d2bf4066c24e1f5f2bc