Merge "Also clear the foreground service usage time for BatteryDiffEntry should hide background usage time." into main

src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java

@@ -169,6 +169,7 @@ public class BatteryDiffData {
             }
             if (packageName != null && hideBackgroundUsageTimeSet.contains(packageName)) {
                 entry.mBackgroundUsageTimeInMs = 0;
+                entry.mForegroundServiceUsageTimeInMs = 0;
             }
         }
     }