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

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

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