[automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 38906db8fe -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 323fbda20e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251
Change-Id: I5df68707b461604caf390d213bf4698f6b190c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: