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

Change-Id: I31e5b77633794a9c429bee882040fb51140e4cf9