Use a simpler constructor

The constructor with two arguments is changing

Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: I56288bb5b3eb9d71ae49128ccbc72fd57abb48d1

src/com/android/settings/fuelgauge/BatteryInfo.java

@@ -163,8 +163,7 @@ public class BatteryInfo {
                     } catch (RuntimeException e) {
                         Log.e(TAG, "getBatteryInfo() from getBatteryUsageStats()", e);
                         // Use default BatteryUsageStats.
-                        stats = new BatteryUsageStats.Builder(
+                        stats = new BatteryUsageStats.Builder(new String[0]).build();
-                                new String[0], /* includePowerModels */ false).build();
                     }
                 }
                 final BatteryInfo batteryInfo =

src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java

@@ -49,8 +49,7 @@ public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats
         } catch (RuntimeException e) {
             Log.e(TAG, "loadInBackground() for getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            return new BatteryUsageStats.Builder(
+            return new BatteryUsageStats.Builder(new String[0]).build();
-                    new String[0], /* includePowerModels */ false).build();
         }
     }
 

src/com/android/settings/fuelgauge/BatteryUtils.java

@@ -375,9 +375,7 @@ public class BatteryUtils {
         } catch (RuntimeException e) {
             Log.e(TAG, "getBatteryInfo() error from getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            batteryUsageStats =
+            batteryUsageStats = new BatteryUsageStats.Builder(new String[0]).build();
-                    new BatteryUsageStats.Builder(new String[0], /* includePowerModels */ false)
-                            .build();
         }
 
         final long startTime = System.currentTimeMillis();

src/com/android/settings/fuelgauge/DebugEstimatesLoader.java

@@ -68,8 +68,7 @@ public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
         } catch (RuntimeException e) {
             Log.e(TAG, "getBatteryInfo() from getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            batteryUsageStats = new BatteryUsageStats.Builder(
+            batteryUsageStats = new BatteryUsageStats.Builder(new String[0]).build();
-                    new String[0], /* includePowerModels */ false).build();
         }
         BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
                 batteryUsageStats, elapsedRealtimeUs, false);