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

Change-Id: Ie7de4f9173a815abe88f91efc5a46893be5270d1
tree: ef019eb6f3aaea9dbd4d8a32d2f28ebb801aa3ae
  1. service/
  2. tests/