am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '0ff3d838b6d313963d6b69632a058d426b8b8132':
  Add checks for READ_PRIVILEGED_PHONE_STATE.