Merge "vold: explicitly specify capabilities" am: 4af861b631 am: 8b23e23987

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

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