Merge changes Ic2ac6a5c,I47dc068e

* changes:
  [MEP] The removale slot can read the esim card
  Changing the condition since the esim may be removable

src/com/android/settings/network/UiccSlotUtil.java

@@ -193,7 +193,7 @@ public class UiccSlotUtil {
                             if (slotInfo == null) {
                                 return false;
                             }
-                            return !slotInfo.isRemovable();
+                            return slotInfo.getIsEuicc();
                         })
                 .findFirst().orElse(-1);