Merge changes I1424053c,I96e35e06 into nyc-dev

* changes:
  WifiConnectivityManager: Unit tests for metrics
  WifiConnectivityManager: Increment metrics
tree: 21a1724bac1a708b2acdf8041c469b26c32c0233
  1. service/
  2. tests/