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: Iaf52de161e43857e22734746fa979bdd893fb80b
tree: 9ae26657bf87eba5ac3ef7ab7afa706dd64d74e6
  1. service/
  2. tests/