Merge "Revert "Convert assumption to conditional in freezer test"" into...

import com.android.server.testables.TestableDeviceConfig;

import org.junit.After;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

    @Test

    public void useFreeze_doesNotListenToDeviceConfigChanges() throws InterruptedException {

        if (!mCachedAppOptimizerUnderTest.isFreezerSupported()) {

            return;

        }

        Assume.assumeTrue(mCachedAppOptimizerUnderTest.isFreezerSupported());

        assertThat(mCachedAppOptimizerUnderTest.useFreezer()).isEqualTo(

                CachedAppOptimizer.DEFAULT_USE_FREEZER);