Merge "Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: ba666e0621 am: 76dc14ec88 am: 1697d48faf" into oc-dev-plus-aosp