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

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

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