Add different Uri formats for Contact-Editor Tests

Change-Id: Ia0419893863427041f988e16a216794a831f4107
Merge "Add different Uri formats for Contact-Editor Tests"
Bringing Call button back to Strequent view

Change-Id: I5281f6aa3d866a514b918b2add8eff6caa4b0762
Generic test code for getting synchronous loader results.

Change-Id: Ic77ebce6d62bffcc6a72dacfbf5f91e687b3dd52
Contact picker restored to some extent

Change-Id: Ib3b5f099dd479a73c944918c8e88e85633c375af
Fixing NPE in PinnedHeaderListView

Change-Id: I4f0227edf9a21c1019f306303b4a6f133e38ab9b
Merge commit '7c5286ed8ba0d7fbe3683b560f69b3a2d4ff1e2a' into HEAD

* commit '7c5286ed8ba0d7fbe3683b560f69b3a2d4ff1e2a':
  Bringing Call button back to Strequent view
  Add different Uri formats for Contact-Editor Tests

Conflicts:
	src/com/android/contacts/PhoneDisambigDialog.java
Merge commit '28d003e55f557d9377af1df3ba9f60bcda8ad073' into HEAD

* commit '28d003e55f557d9377af1df3ba9f60bcda8ad073':
  Generic test code for getting synchronous loader results.
Merge commit '7e6d63b52bb694bd71bef9d2b6b17d9ad27b5fb3' into HEAD

* commit '7e6d63b52bb694bd71bef9d2b6b17d9ad27b5fb3':
  Fixing NPE in PinnedHeaderListView
  Contact picker restored to some extent
Modify ImportVCardService so that it does not rely on a stale constructor.

We are not 100% sure whether this change is really correct though all tests are in green.

Related change: I16e487fa

Change-Id: I0a5aa1ea587c6b2d25ce90ba0a23bc14ea8a12f5
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

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