Add thermal category to atrace. am: e3079a9982 am: e208ed66e6 am: 19c54b3622

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

Change-Id: Ia2190df44d2112d9a392b7a67d3d970f693c201b