[automerger skipped] Merge "Verify URI permission for channel sound update from NotificationListenerService" into sc-dev am: 340a1267f0 am: 250cd984bb am: 4614c36510 -s ours am: ad015f762d -s ours am: a2bd158356 -s ours

am skip reason: Merged-In Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9 with SHA-1 2f26c0def5 is already in history

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

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