[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s ours am: b6516784e1 -s ours

am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history

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

Change-Id: I6b187cd9943e8ac9fbe48d71b7ecaa865ecbc404