Merge "Removing READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also used" into mnc-dev