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: 4c94d3051d am: 3e9726c69c
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: ebf6303f1d am: 9b8282b7ba
  Revert "Addressing comments for http://ag/7700679." am: a293c0644b am: 25f881d116
  Revert "Add one more test for VPN usage stats." am: f97132185a am: 469ee82902
This commit is contained in:
Android Build Merger (Role)
2019-06-07 09:44:50 +00:00
committed by Android (Google) Code Review

Diff Content Not Available