Merge "Settings: Fix sometimes reset progress dialog not dismissed" am:...

Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c0 am: 02701dd8 am: a1e66c3a am: c77a56af am: ac4f2642

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



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