Merge changes Ie64c11f3,I91272aa5 into nyc-dev
am: 9d6a7a1b5f

* commit '9d6a7a1b5f9e9ea194fc6b15044c9d14d6aefabf':
  WifiNetworHistory: Don't persist QNS blacklist
  Change clock for time interval/elapsed measurments

Change-Id: I2d6853435c4851f8fe25b337ec9a46b902350117
tree: 91f6ea08406205d42ba523185c4e30d2d60cc048
  1. service/
  2. tests/