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: b7280f5a

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



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