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

Change-Id: Ie7de4f9173a815abe88f91efc5a46893be5270d1
tree: 5d42f0a8a993cf8a46e44352b71a06bcf725c824
  1. service/