Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev