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

* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
  Move softap config handling to WifiConfigStore