Merge "Revert "Fix UiccSlotInfo.getCardId for inactive eUICC"" into qt-dev
am: 72de2f39aa

Change-Id: I4bd4ec17d5f7d1e93b3807f384dee08ed86d1c52