Layout fixes to match UX specs.

Text in contactlist-items and headers was not
vertically centered.  Addressed by modifying
the XML layout specs.  Also, prevent a tablet-
specific layout parameter from leaking into
the phone.

Bug: 5387945
Change-Id: I3759a15fb49cd62e94bc065459bc79cd6cf71757
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index 6867dea..5aa4a15 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?attr/list_item_header_height"
-    android:paddingTop="@dimen/contact_browser_list_top_margin"
+    android:paddingTop="@dimen/list_header_extra_top_padding"
     android:paddingLeft="?attr/list_item_padding_left"
     android:paddingRight="?attr/list_item_padding_right" >