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

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

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