Merge "[vold] pass along sysfs name in setOptions" into sc-dev am: 29a6d6bb46

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

Change-Id: If3c7d07bf8b365eb3f847f65442dbaab5f67c50d