Merge "Disable flaky testBadApkOnly test." into qt-r1-dev

am: 8e8a2d0cb3

Change-Id: I67579f545adaf2b045d7512825e4154001202a1c

tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java

@@ -25,6 +25,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -63,6 +64,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
      * Tests watchdog triggered staged rollbacks involving only apks.
      */
     @Test
+    @Ignore("b/139175593 flaky test")
     public void testBadApkOnly() throws Exception {
         runPhase("testBadApkOnlyEnableRollback");
         getDevice().reboot();