Merge "Use correct filename when adding to ringtone"
am: daff857ffd

Change-Id: If0d096e7b33c84522c11077df04407ecc224fcf1