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

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