[automerger skipped] Merge "Validate ringtone URIs before setting" into...

[automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f1 am: 8f3d5943 am: deddbe27 -s ours am: 122c120d -s ours

am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c449 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251



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