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