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

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

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