Merge "Add tracepoints to dumpstate sections" am: 8e60888b4b

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

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