Merge "Revert "Don't pause perftest timing while closing ZipFile between iterations"" into main

    @Test

    @Parameters(method = "getData")

    public void timeZipFileOpenClose(int numEntries) throws Exception {

    public void timeZipFileOpen(int numEntries) throws Exception {

        setUp(numEntries);

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            ZipFile zf = new ZipFile(mFile);

            state.pauseTiming();

            zf.close();

            state.resumeTiming();

        }

    }