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

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

Change-Id: I1751238eb75a288c9f13a0c857a00c04e908d1f6