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

[automerger skipped] Merge "Check sound Uri permission when creating a notification channel" into sc-dev am: e9dc3c03 am: 437f5484 am: ae257d87 -s ours am: abe63a66 -s ours am: 48873090 -s ours am: 47e6b667 -s ours am: 70c9026f -s ours

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

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



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