[automerger skipped] Skip ab/6749736 in stage. am: 77ccab85c6 -s ours am: 89c2a751b9 -s ours

am skip reason: Change-Id I8c291533d35384796394151b1581c7e513d16c34 with SHA-1 4c5f4d9feb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/12797207

Change-Id: I974633cc61583d27b08cd2522053bcb95f66cda2