Merge "Fix flaky testEnableRollbackTimeoutFailsRollback test"

            Uninstall.packages(TestApp.A);

            Install.single(TestApp.A1).commit();

            waitForUnavailableRollback(TestApp.A);

            // Block the RollbackManager to make extra sure it will not be

            // able to enable the rollback in time.

            assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);

            // Give plenty of time for RollbackManager to unblock and attempt

            // to make the rollback available before asserting that the

            // rollback was not made available.

            Thread.sleep(TimeUnit.SECONDS.toMillis(2));

            assertThat(

                getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(), TestApp.A)).isNull();

        } finally {