am 7a384469: Merge "Revert "Removing OrSelf check when checking for...
am 7a384469: Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev
* commit '7a384469':
Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."