Merge "NetworkStatsService to adjust VPN stats before recording."