Fix bug where we weren't firing the correct alarm

Had a bug where we were choosing the wrong alarm to fire.

Bug: 10248289
Bug: 10243530
Change-Id: I56d7efa5c3072db1598835bdf194f2c734af19cd
(cherry picked from commit ffdcaef9)