WifiStateMachine: merge scan mode handling
am: 63e847ec06

Change-Id: Ib042e178ce2cd56206bdf0419f1dde28e8122b9e
tree: 7a9f69311dcda7c54aac896f7f5d466f7500b62a
  1. libwifi_hal/
  2. libwifi_system/
  3. service/
  4. tests/
  5. PREUPLOAD.cfg