Merge "Deflake CancelFromNotificationUiTest" into rvc-dev am: 8b475e36b3

Change-Id: I3b46684c2550679f977707f56d1a67fd4eb9031d