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

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

Change-Id: I8fb1bf0712f9bcc10aa36ff24940e95e5b617f62