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

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

Change-Id: Ia0de693ab6e40de6591ebf223ca9da177ae9735e