Merge "Upgrade zlib to 898c6c0dd91fa0efb38a10949f76102e42cc47f0" am: 28b8c108fa am: 2ac6e5bb34

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

Change-Id: I2b807b66b4943afea84ca17103d1e61b04633ea7