[automerger skipped] Skip ab/6749736 in stage. am: 6b6fdb3acd -s ours am: 4f9397d2d9 -s ours

am skip reason: Change-Id I45ea16bb16c5703f4d99f58d65b8414fd3c7ed47 with SHA-1 41f192db1c is in history

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

Change-Id: I95cf9e36f5d2be93475183a2a33dcd0d5338e03b