Merge "Always unmount data and obb directory that mounted" am: ae11ab712f

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

Change-Id: I44aaffd7ecd95ec60af7559592d684460b32c5da