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

Change-Id: I90b1cfcd4555dab966538ab78aefe81af0231f8b