Fix 6449259: FUL no longer overlaps music controls

When Face Unlock was used with pattern backup on a Prime, it was
partially covering the lockscreen music controls that appear when
music is playing.

This makes Face Unlock take up slightly less area when using pattern
backup on phones in portrait layout, regardless of whether the music
controls are showing.  Eventually I would like to make it still use
the full area when the music controls aren't showing, but this is the
safest possible fix for JB and looks ok.

Change-Id: Ib2af440ed0f2729dfff9b58cd154efad43ef5499
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
index 35b8665..c235289 100644
--- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -173,12 +173,11 @@
     <RelativeLayout
         android:id="@+id/faceLockAreaView"
         android:visibility="invisible"
-        android:layout_row="3"
+        android:layout_row="4"
         android:layout_column="0"
-        android:layout_rowSpan="2"
+        android:layout_rowSpan="1"
         android:layout_columnSpan="1"
         android:layout_gravity="fill"
-        android:layout_marginTop="4dip"
         android:layout_marginBottom="4dip"
         android:layout_width="0dip"
         android:layout_height="0dip"