Merge \\"DO NOT MERGE WifiMetrics: Record capture duration\\" into nyc-dev am: 622e9ff387
am: e1b848bb11

Change-Id: I491a7c47e15bbd590df0b57a6d7b8990b2f0c68f
tree: e50ffa822fa1cf3b2fe1a4cd2841faea801a952d
  1. service/
  2. tests/