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: 3f77a566 am: 38d669a6

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



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