Merge "Fix a bug when getting a gzip header extra field with inflate()." into...

Merge "Fix a bug when getting a gzip header extra field with inflate()." into sc-qpr1-dev am: 0b30b5bd am: fc687967 am: 1d661f14 am: 2a4c5da9 am: 9c940cc4

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



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