The previous implementation worked if the set timeout is short enough, which mine was. This one carries the remaining amount of timeout override forward through all of the countdown steps. Bug: 2844990 Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33