Merge "vold: remove unused stop() methods" am: d70e2b4ea9 am: 27a747b8ab

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

Change-Id: I41c720b7260e7fa2b4d0c460df630c7fce8bd135