Merge "dumpstate:thermal: refactor dump_thermal.sh" into udc-d1-dev am: a4e20ba687

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/24145345

Change-Id: I666e7acdbc7d0628b6bb002e5e532c3ab9135ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>