[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 skip reason: skipped by valiiftime

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



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