Merge "Don't remove allocated player IDs when an app has a browse service"

        final MediaPlayerWrapper wrapper = mMediaPlayers.get(playerId);

        d("Removing media player " + wrapper.getPackageName());

        mMediaPlayerIds.remove(wrapper.getPackageName());

        if (!mBrowsablePlayers.containsKey(playerId)) {

            d(wrapper.getPackageName() + " doesn't have a browse service. Recycle player ID.");

            mMediaPlayers.remove(playerId);

        }

        wrapper.cleanup();

    }