Merge "Allow privileged apps to call getUiccCardsInfo" am: 35175b13b0
am: 55b6a78eea

Change-Id: I7b5ef92e9bb096174a853c03838c1145f64c533f