Phonetic names must be displayed next to structured names (E7)

Also keep phonetic name and nickname fields together with the
structured name editor field for the same account.

Bug 23589603

Change-Id: I3298d91dcd0451576374eed2401a768bec84b8e8
3 files changed