Merge changes from topic "atrace_thermal" am: 6a72d8c27c

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

Change-Id: Iba3a52dd954ce97cc66385c41073676db681bb17