Merge "Empty merge ab/12770256 into aosp-main-future" into aosp-main-future am: 12dc47b357

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

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