Merge "dumpstate: explicitly specify capabilities" am: e53e093232 am: fd495c957b

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

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