Merge "Remove WifiNative.getFrameworkNetworkId"