Refactor DataModel.resetOrDeleteTimer(...)

By adding a return value from this method, callers that want to know
whether the timer was reset or deleted can examine the return value
rather that duplicating the logic found within DataModel.

Change-Id: Id63ea1f56c35b21d5b3d8cd7188d28b87926bb45