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

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

Change-Id: I02b2f6d4c39c93d1c3b4be6583b58fa5c0f00060