Merge "Add connectivity owners in tests for NetworkSelection" am: 13c95f4246

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1614904

Change-Id: I9d618c6d04301f847e7e2a8eb14584a1f7a50b50