Merge "vold: remove unused stop() methods" am: d70e2b4ea9 am: 27a747b8ab am: 406cabf717 am: 93f0960cba

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

Change-Id: I51672944372d24483679d6f81df4e80869d3fd99