Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2