Merge changes I77dc5556,If772078c,Idb19b0f7 into sc-dev

* changes:
  Add test for CM#setAvoidUnvalidated
  Provide a way to override the avoid bad wifi configuration
  Remove ConnectivityServiceTest signature perms use