Fix phone number comparison in Phone Favorites.

This switches to using ContactsUtils.shouldCollapse for determining
whether we should combine the two numbers.

Bug 5294289

Change-Id: Id1ec369cfe698b52186ff392255d789458622e9d
5 files changed