Merge "Upgrade zlib to bf44340d1b6be1af8950bbdf664fec0cf5a831cc" am: deaa15577f am: 0650d43c9b am: 0537af6ee6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd669b68a311d2ef35229958e14b5e7da80994a2