Merge "[WifiNetworkSelector] fix regression (NPE)"