Merge "dumpstate: explicitly specify capabilities" am: e53e093232

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

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