Merge "Don't pause perftest timing while closing ZipFile between iterations"...

Merge "Don't pause perftest timing while closing ZipFile between iterations" into main am: 6d5cbfb0 am: 7621da1a

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



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