More aggressive fix for phone lookup issues.
Rather than relying on a trailing suffix match on the longer of the
two numbers (the one from caller ID and the one in the database),
this first attempts to do the full internationalized-number-aware
query that we'd normally do, and if no results are returned, falls
back to a comparison of the trailing 7 digits of each number, as
we did in Gingerbread.
Also ports in Makoto's fix to the phone lookup tests.
Bug: 5742389
Change-Id: Idda8474337bedaced59916c2b0af87b62b737d83
4 files changed