Improve handling for deleteAfterUse timers - DO NOT MERGE

Bug: 24515248

Do not differentiate notification "stop" action for non-deleteAfterUse
and deleteAfterUse timers.
Set timerObj state to STATE_DELETED when deleteAfterUse timer is
stopped.

Change-Id: I33ee021311134b1b120bbf7f793c45d013a8740d
(cherry picked from commit 0f69521d)