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

Change-Id: Ia6b20b5769d305d061424f084c786feb19cbb4da