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

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

Change-Id: Idce0ee0328004bcc5bcf6b0d930d5d52b7d8ce85