Merge "Fix a bug when getting a gzip header extra field with inflate()." into sc-qpr1-dev am: 0b30b5bd18 am: fc68796726

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

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