Merge changes I6fff65eb,Ie49d2319,Ief974217

* changes:
  Make all ConnectivityService#doTestXyz methods private.
  Expect creating the DNS event listener in setUp, not in tests.
  Rename testPreferenceForUserNetworkUpDownForGivenPreference.