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

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



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