Merge "Use UiccSlot.getEid as cardId"
am: ac4e112fb7

Change-Id: Ieb15d0cbb56c4940f19c6e1320e85971e76c3136