[automerger skipped] Merge changes from topic "atrace_thermal" am: 6a72d8c2...

[automerger skipped] Merge changes from topic "atrace_thermal" am: 6a72d8c2 am: 0feb5cc4 am: 822ebef8 am: d4b76147 am: d9cd75f7 -s ours

am skip reason: Change-Id I554038b5b72e04b080a11b060312b4d57d68de5f with SHA-1 29f80141 is in history

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

Change-Id: Id811d63624eb7f738b4cedae083741c337e1893f