Merge "Call setupAppDir before EnsureDirExists" am: d4de02ed14 am: f44cf21080

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ebb973e11e87f4404d13089848b8115bbbee05