Merge changes from topic "openjdk17-zip-tests" into main am: 75a27ea1ea am: bed2737f8d

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2977793

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