[automerger skipped] Merge "StorageManagerService: don't ignore failures to prepare user storage" am: 362f5eaf am: e4b491a3 am: 9bb65485 am: b910363a -s ours

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

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

Change-Id: If7777a15745d7f98ee8bd25550a871df902153ab