Merge "Crash happens if back button is pressed during "Format as Portable""...

Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153 am: 6945e70c am: c80890c7 am: 85768c59 am: ee4c9b6a

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



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