Merge "Revert "vold: explicitly specify capabilities"" am: d0c81a283b

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2377728

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