[automerger skipped] Merge "Check sound Uri permission when creating a...

[automerger skipped] Merge "Check sound Uri permission when creating a notification channel" into udc-qpr-dev am: 112a963d -s ours

am skip reason: Merged-In If5a6c80e3bd665a9e67655a230e43d704422082b with SHA-1 94fc92cf is already in history

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



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