Merge "Add connectivity owners in tests for NetworkSelection"