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

* commit '1e5a3a4ad3765445a2b9f70d9f37a6cc5bd0cda4':
  Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.