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

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



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