Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration."...

Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c39351 am: 9c051367 am: 4c2143df am: 10eceff1 am: b90b509f

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



Change-Id: I5f7b1c7f88ae0340c52ebad56132ec0f1d042e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit a65e6fe7)
Bug: 231407205