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

This reverts commit 77948bf1792c95a2c50215598401a1b20199f252.

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