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

Merge "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: a274f676 am: 63148449" into tm-qpr-dev-plus-aosp am: 28d3662b

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



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