Merge "Verify URI permission for channel sound update from NotificationListenerService" into sc-dev am: 340a1267f0 am: 250cd984bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26225135

Change-Id: I901444d5e3c810d27958260437e07a62400ee3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>