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