Fix IllegalArgumentException.

Include alternative display name in the phone lookup projection, since
the BT app needs it. Fixes this backtrace:

D BluetoothPbapObexServer: search by number, requestSize=1 offset=0 searchValue=4436029097
E DatabaseUtils: Writing exception to parcel
E DatabaseUtils: java.lang.IllegalArgumentException: Invalid column display_name_alt
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.computeProjection(SQLiteQueryBuilder.java:632)
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.buildQuery(SQLiteQueryBuilder.java:447)
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.query(SQLiteQueryBuilder.java:393)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:6066)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.queryLocal(ContactsProvider2.java:5846)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.queryInternal(ContactsProvider2.java:4810)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:4773)
E DatabaseUtils: 	at android.content.ContentProvider$Transport.query(ContentProvider.java:189)
E DatabaseUtils: 	at android.content.ContentProviderNative.onTransact(ContentProviderNative.java:113)
E DatabaseUtils: 	at android.os.Binder.execTransact(Binder.java:351)
E DatabaseUtils: 	at dalvik.system.NativeStart.run(Native Method)

Change-Id: I15f531c5b0ea4b0a4a9de864872dd3256667e568
JIRA:CYAN-2204
Add Facebook contact sync support (2/2)

Change-Id: I3b2c91a49415095fb96f0d95d19e3aeb4ac12ce9

Conflicts:
	src/com/android/providers/contacts/ContactsDatabaseHelper.java
Merge branch 'DerTeufel/cm-10.2'