Merge changes from topic "atrace_thermal" am: 6a72d8c27c am: 0feb5cc47f am: 822ebef806 am: d4b761472b

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

Change-Id: Iaa33d7e1761d9672b098831381a6f91659bd534b