Merge "Add cpuhp_pause into atrace" am: a647f2bc25 am: 87de65eb7f

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

Change-Id: I940c277f11f348f97e156c1cf715f0ae55c5ae4a