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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a483e747fabc635e76dd7fd7b656487c0d0588