Update dismiss logic in SuspendDialogTest to handle watches.
am: bb13bfd926  -s ours

Change-Id: I1b9d55884ee0581947c9a83f84090054440f5a9f