Merge "Delete user data even on error when registering AccessorProviders" into main am: d3525e414f am: 73fc410463

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3363328

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