[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: 430c38f9 -s ours

am skip reason: Merged-In Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9 with SHA-1 9b7bbbf5 is already in history

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



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