Fix a bug where 'avoid unvalidated' is broken

After setting 'avoid unvalidated' the next update of the
score by the agent will set the wrong value for that
flag in the NetworkScore object.

Also have the default behavior on S and T be like the old
one, rather than the new one

Test: manual
Change-Id: I0c161fe7098d3c60827fd50190911b6b762dfa42