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

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

Change-Id: I14d0c854f3c0e42bc90ec3da40b65f99e0672d0c