Fix network stats and policy tests.

Bug: 6299195
Change-Id: I1941b5f7329940cc7469bd3fda17c3dc3a656250
diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java
index e40f166..8634821 100644
--- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java
+++ b/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java
@@ -43,7 +43,7 @@
  */
 @MediumTest
 public class NetworkStatsCollectionTest extends AndroidTestCase {
-    
+
     private static final String TEST_FILE = "test.bin";
     private static final String TEST_IMSI = "310260000000000";
 
@@ -53,10 +53,10 @@
 
         final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
         collection.readLegacyNetwork(testFile);
-        
+
         // verify that history read correctly
         assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
-                636014522L, 709291L, 88037144L, 518820L);
+                636016770L, 709306L, 88038768L, 518836L);
 
         // now export into a unified format
         final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -70,7 +70,7 @@
         // and read back into structure, verifying that totals are same
         collection.read(new ByteArrayInputStream(bos.toByteArray()));
         assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
-                636014522L, 709291L, 88037144L, 518820L);
+                636016770L, 709306L, 88038768L, 518836L);
     }
 
     public void testReadLegacyUid() throws Exception {
@@ -82,7 +82,7 @@
 
         // verify that history read correctly
         assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
-                637073904L, 711398L, 88342093L, 521006L);
+                637076152L, 711413L, 88343717L, 521022L);
 
         // now export into a unified format
         final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -96,7 +96,7 @@
         // and read back into structure, verifying that totals are same
         collection.read(new ByteArrayInputStream(bos.toByteArray()));
         assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
-                637073904L, 711398L, 88342093L, 521006L);
+                637076152L, 711413L, 88343717L, 521022L);
     }
 
     public void testReadLegacyUidTags() throws Exception {