am a13ccc90: Merge change 26175 into eclair

Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp

* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.