Merge "Use UiccSlot.getEid as cardId" into qt-qpr1-dev
am: 2d466f957a

Change-Id: I5df9a885915af8bbcbf7720a64f8162cb245cd73