service: rework service_extend_timeout()

Let's unify common code: let's extend the watchdog timeout and the
regular timeout with the same helper function.