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

[automerger skipped] Merge "Check sound Uri permission when creating a notification channel" into tm-dev am: 52477299 am: 99cec66e -s ours am: 6bf9952c -s ours am: f6872a20 -s ours

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

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



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