Merge "atrace: Add cpuhp trace points" am: dd39a292aa

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

Change-Id: I1d79b44ad2049db9f2151059582900dba682d410