Enforce that internal storage is prepared first am: c193c3fbb8 am: 449ac4d8ff

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

Change-Id: I230fdf8a3a4e38dcaf303c41867fdf924a3eae03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>