Merge "atrace: Add cpuhp trace points" am: dd39a292aa am: c181a1e8d4 am: 4ce5ecc37e am: 2ef7695bf4

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

Change-Id: I9cadc5a50bb121a1f3fe8549cc6e7119d7d6b1b9