Merge changes I61a4877f,I669484d8 into main

* changes:
  Move FakeDns out of NetworkMonitorTest.
  Make FakeDns a static class in preparation for moving it elsewhere.