Dedup NANPA numbers

Reverts changes from Bug 5779336 that stopped using libphonenumber for
detecting dups, although keep matching as strict except when one number
begins with +1, in which case collapse. Change Collapser to allow
preferred collapse direction.

Bug:7519057
Change-Id: Ib8ba6da611638d05781ed4363d71bc2628d907b7
2 files changed