Merge "Record thermal service state using android.os.Trace" into main am: 2ef9db99de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3222702

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