Merge "Add systrace tag for thermal" am: 1889a41c88

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1984173

Change-Id: Ibdde887a3db9bc47b93dc9ab120cee4f4df4c1e7