Merge "Add tracepoints to dumpstate sections" am: 8e60888b4b am: 3708e1c3aa am: ff5b946ad5

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

Change-Id: I2914cbfc6f768b9f8d4bf48909bd09187deeeba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>