Merge "Add tracepoints to dumpstate sections" am: 8e60888b am: 3708e1c3...

Merge "Add tracepoints to dumpstate sections" am: 8e60888b am: 3708e1c3 am: ff5b946a am: a8de48c6

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



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