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

This reverts commit c92dfac065af0a29715eab0c1b45a748d2e5c455.

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

Change-Id: I68d3390417b7c338dd0bf2aa5be9bf42b7b80305