Merge "Use UiccSlot.getEid as cardId"