[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s ours am: 3847b07ecc -s ours

am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history

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

Change-Id: I64e6b9906de8730be7a2d5ea46f16f68e61d7d35