am 69aac6c0: am e75bb543: Merge "Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE" into mnc-dev

* commit '69aac6c04780e6d472d803117f3f593102c42cba':
  Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE