Bug 881716 - [SMS/MMS] Search result for contacts from Messaging app is not showing the carrier r=arcturus


- Ensure that either "Type | Carrier" or "Type | PhoneNumber" displays in thread subheader
- Ensure that "Type | Carrier, Phone" displays in contact search results
- Ensure that "Phone" displays in contact search results when no type or carrier exists

https://bugzilla.mozilla.org/show_bug.cgi?id=881716
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 3c65d31e4e72fd2ee368ff3671f0c65e4f7eb956)