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

Change-Id: Ifb0b6c12f71d637b73e658e8115bca98215e789a