Merge "Use UiccSlot.getEid as cardId" into qt-qpr1-dev