Merge "Canonicalize ringtones before returning." into qt-dev
am: 715c495a41

Change-Id: Icb8c59e81bb4856420f4cfce7554821085097f20