Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: 1d1edc8737 am: c6f7da3787

Change-Id: I9f57fb58181c8c6e78aad4d8cb09d8649513cde3

src/com/android/settings/MasterClear.java

@@ -344,6 +344,8 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
                 noCancelMobilePlan.setVisibility(View.VISIBLE);
                 mEsimStorage.setChecked(true /* checked */);
             }
+        } else {
+            mEsimStorage.setChecked(false /* checked */);
         }
 
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);