Fix error in tick calculation when timer is removed

A previous changed introduced an error in the timer tick calculation
when removing a timer. This could lead to timers expiring sooner than
expected.

Bug: 17390240
Change-Id: Id3291aaf492a7178782e6f804dad71387c3c9382