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

Change-Id: Ifc63813c8326ec27e1c41039c13c430a5a882914