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

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

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