[SMS] Contact search results should include "type | number" where "type" is the number's entry type eg. mobile, home, work r=julienw

Also removed "carrier" from display, as this does not appear in current spec materials.

https://bugzilla.mozilla.org/show_bug.cgi?id=872395

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 38ce0068bad14e27b42b9b3800ade592f1b9c9f4)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Bug 874358 - [SMS] Can't create contact from SMS App r=borjasalguero

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit e2e58db18b0dbf48deb6a329965126c5c9733307)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js