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

[automerger skipped] [conflict] Merge "Check sound Uri permission when creating a notification channel" into udc-dev am: ae3d9211 am: 1279fd1f -s ours am: 93ae7485 -s ours

am skip reason: skipped by valiiftime

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



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