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

* commit '186b15a7a176b56477b2099ea81c330649071811':
  Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.