Merge "cryptfs: try harder to unmount subdirectory mounts" am: 827dfe6e75

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

Change-Id: Ia4e3e045742d5aa15fb25d20c027911a84872195