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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc67fc45df3a5c9ec8946739531d51462736967f