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

Change-Id: I6ff46e64b26a42693eee3dbc541d34562e043a78