Snap for 6449986 from 4b42462c25f53a0b2738d4266d704b42d1f211a1 to rvc-release

Change-Id: Iab2ba4cf22c235596383b7cf8b505af0104603ec

services/core/java/com/android/server/net/NetworkStatsFactory.java

@@ -385,10 +385,9 @@ public class NetworkStatsFactory {
         // Migrate data usage over a VPN to the TUN network.
         for (VpnInfo info : vpnArray) {
             delta.migrateTun(info.ownerUid, info.vpnIface, info.underlyingIfaces);
-        }
-
             // Filter out debug entries as that may lead to over counting.
             delta.filterDebugEntries();
+        }
 
         // Update mTunAnd464xlatAdjustedStats with migrated delta.
         mTunAnd464xlatAdjustedStats.combineAllValues(delta);