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

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

Change-Id: Iafd559b1fbbec8ccca4fac8ff9ea8bda88810e2b