Merge "getUiccCardsInfo does thorough permission checking"
am: 3f0a25ed1a

Change-Id: I8a36b9873d9dd897f8e1d13ac7aa3b8732d675d0