am 43d23ef3: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev

* commit '43d23ef3875d6f605c541ef6cafc5db1b891ea52':
  Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.