Merge "Merge "[SettingsProvider] verify ringtone URI before setting" into...

Merge "Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 94189125 am: 037f529f am: 456da723 am: ff4b0629 am: 9fd44ec1 am: 8c85c68c am: 8d77298c am: 2b59bed3 am: 3eda0bd7" into udc-d1-dev-plus-aosp am: ca0892aa

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



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