Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc

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

Change-Id: I52e40353b3890676704884c5fd7fbe73016c9c3c