Merge "Add systrace tag for thermal" am: 0f899ce8dc am: 923b33542a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1984381

Change-Id: I08dede85d30e60c7649f6a790cf9e9a8e589b9ec