Merge changes from topic "vpn_data_accnt_revert"

* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for"
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
  Revert "Addressing comments for http://ag/7700679."
  Revert "Add one more test for VPN usage stats."
tree: 362b8a48692ee36efa0e67fef8e52cb134795567
  1. core/
  2. services/
  3. tests/