am 3af90791: am 72749c5a: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev

* commit '3af90791bcb5174f92b80ae5a2f36cd084aaaf57':
  Additional OP_READ_PHONE_STATE AppOps checks for telephony