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

* commit '3d056288f2c492501d7e5120ea5fa1559a04cba2':
  Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.