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

Change-Id: I71646389c6e5eb7b20bd1b55715e2d600703fa60