tighten star margin on phone and narrow tablet

Bug: 8870312
Change-Id: I34ce2d5e11d747ca141c0733c7793d03b27257c7
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index 25eabe4..311f5c6 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -148,13 +148,12 @@
                     android:layout_marginTop="-1dp"
                     android:src="@drawable/ic_star_off" />
 
-                <!-- we assume the star asset is less than 48dp wide -->
                 <TextView
                     android:id="@+id/subject"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/star"
-                    android:layout_marginRight="14dp"
+                    android:layout_marginRight="7dp"
                     android:lines="2"
                     android:textSize="13sp"
                     android:includeFontPadding="false"
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index 7bc05d3..0b80627 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -148,13 +148,12 @@
                     android:layout_marginTop="-1dp"
                     android:src="@drawable/ic_star_off" />
 
-                <!-- we assume the star asset is less than 48dp wide -->
                 <TextView
                     android:id="@+id/subject"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/star"
-                    android:layout_marginRight="14dp"
+                    android:layout_marginRight="7dp"
                     android:lines="2"
                     android:textSize="13sp"
                     android:includeFontPadding="false"