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

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

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



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