Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c3935195

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096495

Change-Id: I04a900eafdae1150a415a7bd3eaf8d7e13234c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java

@@ -70,6 +70,9 @@ public class ZipFilePerfTest {
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
         while (state.keepRunning()) {
             ZipFile zf = new ZipFile(mFile);
+            state.pauseTiming();
+            zf.close();
+            state.resumeTiming();
         }
     }