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

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

Change-Id: If5f2440d3c7621bc9ce9260e5f7d0ad3b5d71d65