Merge "Fix BatteryStats counts foreground activity time."