am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

* commit '1c9126c64b56b6465fd551680461caed2e1ea20d':
  Convert soft ap config store to state machine