Merge "Explicitly exclude @Ignore annotation"

    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.server.wm.flicker"/>

        <option name="exclude-annotation" value="org.junit.Ignore" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6000s" />

        <option name="hidden-api-checks" value="false" />