Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: ac4f2642f0 am: 5c6699ca7a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363 Change-Id: Ic5497625607b057c11c213265f913c2da6ee5381 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: