Merge "vold: remove unnecessary code from VolumeManager::unshareVolume()"