Merge timer and timeprovider to fix timer leak

[#83086162]

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>