Mark ab/6881855 as merged am: faae8eb7e2 am: 3427aff7de

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

Change-Id: I679604a3dc7fc2094b0c9386846b77da25aa7b87