Merge \\\"DO NOT MERGE WifiMetrics: Record capture duration\\\" into nyc-dev am: 622e9ff387 am: e1b848bb11
am: 5b6e1eeabe  -s ours

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