[automerger skipped] Merge "Verify URI permission for channel sound update...

[automerger skipped] Merge "Verify URI permission for channel sound update from NotificationListenerService" into sc-dev am: 340a1267 am: 250cd984 am: 4614c365 -s ours am: ad015f76 -s ours am: a2bd1583 -s ours am: 1d3d40b6 -s ours

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

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



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