Merge changes I0dc87735,I314cdf0a

* changes:
  [WifiCandidates] Simpler scoreCandidates interface
  [WifiCandidates] Plumb isMetered
tree: c79b1f55eab648c45c1ad221efa6f26e3bafff99
  1. service/
  2. PREUPLOAD.cfg