That's the usual meaning when AOA is being used.
However you have to be EXTREMELY careful about context; if I'm, say, discussing aerodynamic loads on an aircraft component I may well talk in terms of local angle of attack in which case I am changing both the local geometric reference and the free stream reference possibly. The tailplane is an excellent example where this occurs. Usually when discussing the aerodynamic characteristics of the tailplane one will use TAIL AOA which is measured between the local freestream (which includes the effect of wing downwash) and the local tail reference (which moves as the tail moves on an all-moving tail, but doesn't move if the elevator alone moves). But if I were analysing the tail effect at an aircraft level, I'd be going back to using aircraft level AOA as described before.
It all depends on the context the person is using and thats why a generic "what is AOA?" question can result in many different answers, which may all be correct in the right circumstances