Not sure what you mean by the "done thing". Wouldn't you consider 17% tip enough? I would never leave more than that.
If they choose to automatically include a gratuity, then no reason to add more unless they did something extraordinary..... you may already be paying a premium to get the room service.