Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80

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

Change-Id: I80c2583f27d3376a065f93d985e832c99001536f