Correctly match against normalized phone numbers.

When trying to match against inserted phone numbers, using the
normalized number is the only way to get reliable results - otherwise it
depends on the number formatting whether a match is found or not.

Change-Id: If2aa03f9d9c978ba9f2008929162570766ffdafd
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2