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

Change-Id: I0ccef562bdc9542a581ea70c2f7a7633ef9d17ef
tree: e87da082fc0c8ad1aa075f88becd3874331c6abb
  1. service/
  2. tests/