Fixing the logic for assigning a name to a contact after a manual join.

Was: same as during automatic join.
Now: always favor the contact you started with.  Ignore the name of
the contact that is being joined in.

Bug: 2164422
Change-Id: Iaf36351413541d7b9d715eef3535aa4292b61915
1 file changed