Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev am: c0ce489df7

am: 7183acc20e

Change-Id: I63232bdcde7bf4050140c20e41afc9e91bfb3b5f

core/java/android/os/RecoverySystem.java

@@ -751,7 +751,9 @@ public class RecoverySystem {
         // Block until the ordered broadcast has completed.
         condition.block();
 
-        wipeEuiccData(context, wipeEuicc);
+        // TODO(b/63693573): Uncomment this once the pSIM slot is restored as needed
+        // after the ensuing boot. Currently you end up stuck on the eSIM.
+        // wipeEuiccData(context, wipeEuicc);
 
         String shutdownArg = null;
         if (shutdown) {