Merge \"Return display_name after joining multiple contacts.\" into ub-contactsdialer-f-dev
am: d27f1ab6ab

Change-Id: I4cc6327d81d91f08519a2d8c8aae4a503674a916