Merge "Upgrade zlib to 40e35a76" into main am:...

Merge "Upgrade zlib to 40e35a76" into main am: 8dfcd22a am: c0b5bc94

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



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