[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: 80ae04f2 am: 9981ea46 am: d96bb1f7 -s ours

am skip reason: Merged-In I7977a8b6eea4b75873787e0ab75de7b4e788f2df with SHA-1 2d88dd97 is already in history

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



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