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

Merge "Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c39351 am: 9c051367 am: 4c2143df am: 10eceff1 am: b90b509f" into tm-dev am: 12e59904 am: 8d2d35b1 am: 73b2e0ea am: a907a8c9

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



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