Merge timer and timeprovider to fix timer leak

[#83086162]

Signed-off-by: Abhi Hiremagalur <ahiremagalur@pivotal.io>