am d976d93f: Merge "Modify telephony permissions to use either...
am d976d93f: Merge "Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE" into mnc-dev
* commit 'd976d93f':
Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE