Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev
am: f37b271894  -s ours

Change-Id: I28f139b2bc5a42eed4caf01bea7a1a9426a91625
tree: 295ac73e41c876ff2801439f139448d4e2b89a19
  1. core/
  2. services/
  3. wifi/