Always follow the user's preferred contact display name format.

Change-Id: I46847530b7c8156741a5a03f0080b23162cf248d
Merge "Always follow the user's preferred contact display name format." into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1