Update to match fragment APIs.

Change-Id: I25ed185741b1dd16532216110f4610d9082dbc12
Merge commit '84df2b6fc59ad185a6fdc4f46f636e7783e5f1ae' into HEAD

* commit '84df2b6fc59ad185a6fdc4f46f636e7783e5f1ae':
  Update to match fragment APIs.
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
Refactoring contact list mode resolution.

Also, removing tons of obsolete code.

Change-Id: Ib661fae4f7568e18bb98d5f5e85d1ba75dc32cdb

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