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

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

Change-Id: I8a5676e6fac3d131dd7ebdb214cd09bf3b6de1e4