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

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

Change-Id: I5ef89f8f7885bd0259cf6e4a07f6f3d367263df4