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

* commit '02a966993ce283bfaf3078865b0f684d280db249':
  Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.