Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: ba666e0621
am: 76dc14ec88

Change-Id: I64f50d63f56533264a94bf36520f6939b1e51a00