Merge "Fix that the user has no way of knowing if the reset was successful."...

Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev am: d2e82f8e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252808



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