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

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

Change-Id: I3be431980ab7f4b2d585b09ddf00409851c8cb4e