Merge changes Ie64c11f3,I91272aa5 into nyc-dev

* changes:
  WifiNetworHistory: Don't persist QNS blacklist
  Change clock for time interval/elapsed measurments
tree: 9ae26657bf87eba5ac3ef7ab7afa706dd64d74e6
  1. service/
  2. tests/