[automerger skipped] Merge "StorageManagerService: don't ignore failures to prepare user storage" am: 362f5eaf81 am: e4b491a38a am: 9bb654855f am: b910363af3 -s ours

am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 50946dd15f is already in history

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

Change-Id: If7777a15745d7f98ee8bd25550a871df902153ab