[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: 8dc1784a am: f088deb1 -s ours am: 1d2c0205 -s ours am: b62634d4 -s ours

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

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



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