Fix some broken logic in sending outbound caller ID.

* trust_id_outbound was required even when the caller ID was not marked
private. This is against intentions and documentation.
* We now check both name and number privacy instead of checking name privacy
twice.



git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@393793 f38db490-d61c-443f-a65b-d21fe96a405b