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

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

Change-Id: I2a7c1fcdd70bcf3988a158b6693a44c7be225c10