am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
  Move softap config handling to WifiConfigStore