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

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

Change-Id: I813a871eba2f8b8bee3516f5de71e2b7f7b1f61d