Yes, it encompasses both and means the ability to be self governing, either in the official sense of government, or in the personal sense of being able to do what one wishes to do upon one's own volition.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.