Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d." am: 732c4123f3 am: 2544bc924e

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

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