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

Change-Id: Ic5cd82585cac4803a6f095e44ac6f27ea57f1aee