Fix CTS test for system settings. Bug: 2527622

There's no guarantee that the font_scale property is already present in the db.
Test the config change separately from the count test.
diff --git a/tests/tests/provider/src/android/provider/cts/Settings_SystemTest.java b/tests/tests/provider/src/android/provider/cts/Settings_SystemTest.java
index b7caac3..578cca3 100644
--- a/tests/tests/provider/src/android/provider/cts/Settings_SystemTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Settings_SystemTest.java
@@ -131,16 +131,6 @@
             assertTrue(System.putString(cr, stringField, stringValue));
             System.setShowGTalkServiceStatus(cr, true);
 
-            // backup fontScale
-            Configuration cfg = new Configuration();
-            System.getConfiguration(cr, cfg);
-            float store = cfg.fontScale;
-
-            // update fontScale row
-            cfg = new Configuration();
-            cfg.fontScale = 10.0f;
-            assertTrue(System.putConfiguration(cr, cfg));
-
             c = cr.query(System.CONTENT_URI, null, null, null, null);
             assertNotNull(c);
             assertEquals(origCount + 5, c.getCount());
@@ -154,13 +144,6 @@
             assertEquals(stringValue, System.getString(cr, stringField));
             assertTrue(System.getShowGTalkServiceStatus(cr));
 
-            System.getConfiguration(cr, cfg);
-            assertEquals(10.0f, cfg.fontScale);
-
-            // restore the fontScale
-            cfg.fontScale = store;
-            assertTrue(System.putConfiguration(cr, cfg));
-
             // delete these rows
             String selection = System.NAME + "=\"" + intField + "\"";
             cr.delete(System.CONTENT_URI, selection, null);
@@ -180,6 +163,23 @@
             c = cr.query(System.CONTENT_URI, null, null, null, null);
             assertNotNull(c);
             assertEquals(origCount, c.getCount());
+
+            // backup fontScale
+            Configuration cfg = new Configuration();
+            System.getConfiguration(cr, cfg);
+            float store = cfg.fontScale;
+
+            // update fontScale row
+            cfg = new Configuration();
+            cfg.fontScale = 10.0f;
+            assertTrue(System.putConfiguration(cr, cfg));
+
+            System.getConfiguration(cr, cfg);
+            assertEquals(10.0f, cfg.fontScale);
+
+            // restore the fontScale
+            cfg.fontScale = store;
+            assertTrue(System.putConfiguration(cr, cfg));
         } finally {
             // TODO should clean up more better
             c.close();