Merge changes Ia7dd4afc,Ia7f03444,I2832835c

* changes:
  [WifiCandidates] Simplify CandidateScorer
  [WifiCandidates] More flexible UCS
  Wifi network selection tuneup
tree: b53e20ae264eca8c233a6df1071b18a6cbb23af8
  1. service/
  2. PREUPLOAD.cfg