am bf591b89: am 7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for...
am bf591b89: am 7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit 'bf591b89':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds