[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 -s ours am: 047e8b06ed -s ours

am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history

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

Change-Id: I248956bb396480a5ffca5490090d7cd9715f9749