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