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

[automerger skipped] Merge "Verify URI permission for channel sound update from NotificationListenerService" into tm-dev am: 77fdb470 am: 10baa393 am: 0f3aa9d1 -s ours am: 49cdaf1d -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/+/26230695



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