Update battery charging status string

- Present status string only when status anomalous
 - Remove app usage pages divider

Bug: 185448191
Bug: 187767337
Bug: 187778673
Test: make SettingsRoboTests
Change-Id: I7829e9deed05fb7d95d483ddb718abfdc53b1aa6

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

@@ -46,6 +46,7 @@ public class BatteryInfo {
     public CharSequence chargeLabel;
     public CharSequence remainingLabel;
     public int batteryLevel;
+    public int batteryStatus;
     public boolean discharging = true;
     public boolean isOverheated;
     public long remainingTimeUs = 0;
@@ -238,6 +239,8 @@ public class BatteryInfo {
                 == BatteryManager.BATTERY_HEALTH_OVERHEAT;
 
         info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast);
+        info.batteryStatus = batteryBroadcast.getIntExtra(
+                BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN);
         if (!info.mCharging) {
             updateBatteryInfoDischarging(context, shortString, estimate, info);
         } else {