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

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



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