Merge "Clean up scan from WifiStateMachine" into nyc-dev
tree: 4f93432c49b5cfb7d2d9f295ef4cc66720836993
  1. service/
  2. tests/