Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459

* changes:
  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""
tree: f26350414be97c21fb1efd367c44c27d8717ccc9
  1. core/
  2. services/
  3. tests/