Merge "Add LOCAL_LICENSE_KINDS to external/zlib" am: a07c86f6ca am: 11be7e137d am: 1e8a97240e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie93e6f795b0ff5d4a372aa66deadd8b255f945b5