Merge "Fix logspam when user removed before CE storage prepared" am:...

Merge "Fix logspam when user removed before CE storage prepared" am: 481a5367 am: 6f2860e3 am: 82a70284 am: ca088076

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456268



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