[automerger skipped] Add thermal category to atrace. am: e3079a99 am:...

[automerger skipped] Add thermal category to atrace. am: e3079a99 am: e208ed66 am: 19c54b36 am: f2cc99be am: e7034968 -s ours

am skip reason: Change-Id Ia64ddebfc821fb3d48c7b888ca84cf970eebff77 with SHA-1 86d46df5 is in history

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

Change-Id: I7ba15decbb6d9ea5a2480198ec6a8690cd5efc3a