* changes: Inline readNetworkStatsDetailInternal, make mUseBpfStats final Remove VPN info arrays from NetworkStats(Observer|Recorder) NetworkStatsFactory: Take VPNs into account for network/battery stats Remove duplicate line in clat_simple test file Remove unused lastStats parameter Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""