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

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

Change-Id: Ie316ea2e2e47894d142769cb75b47db2999931a2