am 45db67f2: Merge change I808651dc into eclair-mr2

Merge commit '45db67f2e89341412613ea6b162dd0ad36f091c6' into eclair-mr2-plus-aosp

* commit '45db67f2e89341412613ea6b162dd0ad36f091c6':
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().