Merge "WifiSsidPolicy replace static method with constructor"