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

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

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