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: Ib4c82fab050154061f4fa02f4054e5c9a7e25d63