Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp

* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for" am: ac06c102 am: 3e9726c6
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: 055992b1 am: 9b8282b7
  Revert "Addressing comments for http://ag/7700679." am: 1fbf261c am: 25f881d1
  Revert "Add one more test for VPN usage stats." am: 54a08a68 am: 469ee829