[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4bb423b12c -s ours am: 0af6d89bcc -s ours am: ec3b1d2c1b -s ours

am skip reason: Merged-In I448a17be0704a5f537984335e341a993d2190196 with SHA-1 a995a52802 is already in history

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

Change-Id: Idf63d14718a83fb66e7a78f0af89d3c90ab4c15c