Merge changes Ie19e66b9,Idfcc51e2,Ie2b6f031 into nyc-dev

* changes:
  WifiController: set to proper state after SoftAP
  WifiControllerTest: cleanup style issues
  WifiSettingsStore: add methods for WifiSavedState
tree: 10c77e8c042d299596284f434c5b5b64498ec498
  1. service/