Merge changes Ibc4d74f8,Iba8952e0

* changes:
  WifiConnectedScorer: Only set on primary ClientModeManager
  Clean up WifiScoreReport
tree: 5fdced1fa87fdc15b269650c1f1d6c1f54c066cd
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg