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

        String setting = getSettingForType(type);

        if (setting == null) return;

        if(!isInternalRingtoneUri(ringtoneUri)) {

            ringtoneUri = ContentProvider.maybeAddUserId(ringtoneUri, context.getUserId());

        }

        Settings.System.putStringForUser(resolver, setting,

                ringtoneUri != null ? ringtoneUri.toString() : null, context.getUserId());

        }

    }

    private static boolean isInternalRingtoneUri(Uri uri) {

        Uri uriWithoutUserId = ContentProvider.getUriWithoutUserId(uri);

        return uriWithoutUserId == null ? false : uriWithoutUserId.toString()

                        .startsWith(MediaStore.Audio.Media.INTERNAL_CONTENT_URI.toString());

    }

    /**

     * Try opening the given ringtone locally first, but failover to

     * {@link IRingtonePlayer} if we can't access it directly. Typically happens