Merge "Merge "getUiccCardsInfo does thorough permission checking" am: 3f0a25ed1a" into stage-aosp-master am: 8825b9c99a
am: bfb1b92723

Change-Id: Ibf7141a907d08af6218c4f07a7cedb1b6a302c81