Merge "Check if storage app data and obb directories exist in vold" am: a7c8ae7845 am: a9f7807862 am: c5df178d55

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I610f6eed18785fe398f34d4e9c6d59a4c2f1ddbc