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

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

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