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

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

Change-Id: I3d068df59d9ba0786437a32f1750d271f142581d