am 0b23084d: am 0bae9241: Merge "Change the order of permission checks for READ_PHONE_STATE." into mnc-dev

* commit '0b23084d6cea868122a49dad8cca85cc1cd8d10e':
  Change the order of permission checks for READ_PHONE_STATE.