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

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