[automerger skipped] Ignore errors preparing user storage for existing users am: e667b604 am: 1dd78739 am: 9d405365 am: 4c523a5a -s ours am: e122ed1a -s ours am: da9d6b23 -s ours am: 0d008c26 -s ours

am skip reason: Merged-In I9bdd1a4bf5b14542adb901f264a91d489115c89b with SHA-1 e667b604 is already in history

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



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