Merge "testNotificationDelegate_grantAndReadChannel: extends the wait time to reduce flakiness"