Merge "Revert "dumpstate: explicitly specify capabilities"" am: 74277baf am:...

Merge "Revert "dumpstate: explicitly specify capabilities"" am: 74277baf am: 4023b99f am: eb0a009c

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



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