Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am:...

Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b7 am: 4ec1953a" into tm-d1-dev-plus-aosp am: 64e9a40d

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



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