Make CancelFromNotificationUiTest more stable am: ff23d0bc4d
am: c05acec472

Change-Id: I1fa814ecc80ce7622982a5e3dc382691451799ca