Merge "[vold] pass sysfs_name to mount options" into sc-dev am: 5c0e80571f

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

Change-Id: Iac54e371e9728bdf92570d0f1bf5172308562cad