I'd argue both. "Don't eat when you aren't hungry" is very often violated because eating is social activity. I also don't see why would everybody agree on "Always eat when you're hungry". I think it's better to drink a glass of water (or tea) or milk when you are hungry or do something else instead like going somewhere where you should be, doing something you should do or just playing a game.
The disconnect between hunger and the need to eat may be an artifact of the separation of flavor from nutrition in modern, engineered "foods". To me it seems that hunger must have evolved as a fundamental signal to do or not do exactly what it's about (eat) but that it's been disrupted by modern developments.