Merge changes from topic "revert-2303933-AIWWQZBWPI" am: c00a56d22c am: 7f6e55fa91

Original change: https://android-review.googlesource.com/c/platform/system/libziparchive/+/2306038

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