Merge changes I1424053c,I96e35e06 into nyc-dev

* changes:
  WifiConnectivityManager: Unit tests for metrics
  WifiConnectivityManager: Increment metrics
tree: 2708acb65d8ee2c812c60ced02fa3c8c84beeaf1
  1. service/