Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev