Only show populated fields and have an Add button instead

Bug: 2680699
Change-Id: I42d27ce9df4a604daaf70a2715f4c2cf0095cfcb
Initial integration of search into the two-pane activity

Change-Id: I86277648716e7408ff65282c07a5d0a4f0b7d183
Merge commit 'bb556954e29ae0700b729f128d8cd09ecdd91ee3' into HEAD

* commit 'bb556954e29ae0700b729f128d8cd09ecdd91ee3':
  Only show populated fields and have an Add button instead
Merge commit 'fda092b7d54e9c709ec759cb0b922010dee4daa6' into HEAD

* commit 'fda092b7d54e9c709ec759cb0b922010dee4daa6':
  Initial integration of search into the two-pane activity
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