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

[automerger skipped] Merge "Verify URI permission for channel sound update from NotificationListenerService" into udc-dev am: a8878f29 am: ef7cc747 am: 99c40e8a -s ours

am skip reason: Merged-In Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9 with SHA-1 71cfb89a is already in history

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



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