[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: 2b495522 -s ours am: f2dd2dbc -s ours am: d4701389 -s ours am: fdd2c4e5 -s ours am: 61696373 -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: Ib385ae3fa01d47a32033af2f9d93b97f65a51821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>