Merge changes I78814c38,I2ca937f8

* changes:
  [WifiNetworkSelector] Prototype scorer
  Add wifi/CandidateScorerTest