Merge "UserDataPreparer: be more careful about auto-deleting data on error"...

Merge "UserDataPreparer: be more careful about auto-deleting data on error" into main am: 2506df92 am: dc68b570 am: fa4dedbf

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



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