Merge "testNotificationDelegate_grantAndReadChannel: extends the wait time to reduce flakiness" am: f46b5d4377 am: 130d8ab527

Original change: https://android-review.googlesource.com/c/platform/cts/+/1526813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32e122711f2e9302cbe43eb4ea08781ad8038e18