[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: 56963ca5 -s ours am: 08893e34 -s ours am: 7d920b57 -s ours am: a76a48e5 -s ours am: dc47152f -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: I956f5cd9f54cdbf6020683f096571e1e9d5c8994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>