DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.

BUG: 30839080
BUG: 31007021

(cherry picked from commit a4dc2a7129)

(cherry picked from commit b8a440f538)

Change-Id: I45efc93b40e526467c97d0735289db1404ccd22d

services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java

@@ -101,6 +101,7 @@ import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -372,7 +373,8 @@ public class NetworkStatsServiceTest {
     }
 
     // TODO: simulate reboot to test bucket resize
-    // @Test
+    @Test
+    @Ignore
     public void testStatsBucketResize() throws Exception {
         NetworkStatsHistory history = null;