Merge "Vold will always bind mount obb and data dirs to lowerfs" am: 159a11f600 am: fab8b2835b am: 00a48a7a99

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

Change-Id: I4e22134f7590e94e619361b7d7814b6b4b0585f8