Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev

am: 7b445d59ef

Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

@@ -36,6 +36,8 @@ import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.setupwizardlib.GlifLayout;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -56,6 +58,17 @@ import org.robolectric.shadows.ShadowDrawable;
         })
 public class ChooseLockPasswordTest {
 
+    @Before
+    public void setUp() throws Exception {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_headlineFontFamily, "");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void intentBuilder_setPassword_shouldAddExtras() {
         Intent intent = new IntentBuilder(application)