Here Aristotlean Logic is actually useful. Bodily Autonomy and Freedom of Choice are different, but that is only because one is a subset of the other. It’s true that not all violations of freedom of choice are infringements on bodily autonomy. But all infringements on bodily autonomy are violations of the freedom of choice.

When the Government arrests anyone who would provide you with a service that would enable you to choose to use your body in a certain way, that violates your bodily autonomy because it violates your freedom of choice about what to do with your body