[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: afd18b91 -s ours am: 43ded0dc -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/+/26230695



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