Merge "Add stats session end timestamp and duration to BatteryUsageStats" into sc-dev