Merge "Revert "vold: explicitly specify capabilities"" am: d0c81a283b am: 4a5304d225 am: 3b432309ef

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

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