Merge changes from topic "67429363-score-metrics-master"

* changes:
  Metrics for connected wifi score
  WifiMetricsTest fixes