Merge "Automatically clean up flicker test data"

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="directory-keys" value="/sdcard/flicker" />

        <option name="collect-on-run-ended-only" value="true" />

        <option name="clean-up" value="false" />

        <option name="clean-up" value="true" />

    </metrics_collector>

</configuration>