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

[automerger skipped] Merge "Check sound Uri permission when creating a notification channel" into udc-dev am: 73b63b79 am: e7f62c4a -s ours

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

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



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