Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153

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



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