[automerger skipped] Merge "Use UiccSlot.getEid as cardId" am: ac4e112fb7 am: 65a606481b
am: c8f9efad87 -s ours
am skip reason: change_id I0897046386e155e32f2f98effa1654a7b81bd340 with SHA1 01bd00dc1c is in history

Change-Id: I303be93715277db4935861a1570178791abf481d