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

Change-Id: I7ee11714cbccfa587b42a0f991ab11abaec24cec
tree: 62826248ed0e743707a9a11d51b5a5c820f172db
  1. service/
  2. tests/