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