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

Change-Id: I35d93e842e9748c61196a95b9892741e849deb77