Merge "Record thermal service state using android.os.Trace" into main