[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: 9e3cc0b2 -s ours am: bc7a0f36 -s ours am: d7f4f864 -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: Iec1566559f904bc74ce6b846cea8f01cd5d43d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>