Merge "Add support for continuously accumulated BatteryUsageStats" into main