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

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

Change-Id: Iee41dc3a0540cfd39014a47db43e2ca2c1592e32