Merge "Update the battery string." into pi-dev

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java

@@ -151,7 +151,7 @@ public class BatteryTipDialogFragmentTest {
                 .isEqualTo(
                         "To save battery, stop these apps from using battery in the background. "
                                 + "Restricted apps may not work properly and notifications may be"
-                                + " delayed.\n\nApps:\n");
+                                + " delayed.\n\nApps:");
         assertThat(shadowDialog.getView()).isNotNull();
     }