Fix mismatched function arguments in Contact query

addNameRow's last four arguments are
    accountName, displayName, firstName, lastName
while here it's called as if they were
    displayName, firstName, lastName, displayName
This was causing Exchange copied contacts to have the wrong format.

Also, addPhoneRow gets called with displayName instead of accountName as
the function signature says.

Change-Id: I19a918d599b8f395e0034d00a37d80c72e0d20f2