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

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