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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26a191d111aacb5db38ceff887ff9d5efe8d8a16