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: I8d7eb52cac180402bc2a6702e354ebb38e49a6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>