[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 -s ours am: 1647e7fada -s ours

am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history

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

Change-Id: Ieffaedf0638185218386ff09e2f18451275c2d06