Merge "Prevent libz from providing stubs for vendor/product modules" into main...

Merge "Prevent libz from providing stubs for vendor/product modules" into main am: 95dcfbd5 am: af9c6d3c

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



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