I am unaware of any definition of the phrase "public service" which requires physical fitness or masculinity. We are not talking about military service here.

The dictionary definition I pulled up quickly is:

   1. Employment within a governmental system
   2. A service performed for the benefit of the public

I cannot imagine how #2 could be any more inclusive than it already is. If anything, the current definition is overbroad, to where almost anything could be spun as public service.