Follow Fragment API change: framework now handles menus.

Change-Id: I1bb8d4616e2b09a9c7139d4f4f5a5267c55c96e9
Move vCard related codes to com.android.contacts.vcard.

Bug: 2733143
Change-Id: I35ddb7473a78131b21311e16583390f5f799c195
Merge commit 'eb4d1bf9868dfddd958d8f028e36a4d2da7a8731' into HEAD

* commit 'eb4d1bf9868dfddd958d8f028e36a4d2da7a8731':
  Follow Fragment API change: framework now handles menus.
Merge commit '1b918e58f4a3ae8d32af83f6f69bbf2de57a94f9' into HEAD

* commit '1b918e58f4a3ae8d32af83f6f69bbf2de57a94f9':
  Move vCard related codes to com.android.contacts.vcard.

Conflicts:
	src/com/android/contacts/vcard/ImportVCardActivity.java
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Revert "DO NOT MERGE Sticky tab rule: Remember the last tab that was used to call"

This reverts commit 00ea05799040a55f85cc449fede956983003af97.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
	src/com/android/contacts/DialtactsActivity.java
	src/com/android/contacts/PhoneDisambigDialog.java
	src/com/android/contacts/ViewContactActivity.java
Revert "Implement granting of URI permissions from picker.  DO NOT MERGE."

This reverts commit 958aca24fb348cd8795a952df7de299f09e66d2d.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java