Merge "Upgrade zlib to 3cec0573" am: 48c4ce50 am: 1940c1c7

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



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