Merge "StorageManagerService: don't ignore failures to prepare user storage"