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