Merge "Revert "vold: explicitly specify capabilities"" am: d0c81a28 am: 4a5304d2

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



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