[automerger skipped] [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a04 am: 63fec800 am: 0ee586de -s ours am: 3f976d45 -s ours am: 5e7d5c80 -s ours am: ac37b78d -s ours

am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 9d2bb776 is already in history

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



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