Merge "[RingtoneManager] Remove user id from internal Uri"