Merge "WifiConfigManager: Don't reset the userId on user stop" into oc-mr1-dev