Merge "Vold should still create obb / data dirs for sdcardfs device" am: f5967975b0 am: 61d8298959 am: da23304fec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I179431f1cc699be92e065e9c21157efc0a7ff6bb