Merge "Patch zips makefile to properly use private variables" into main am:...

Merge "Patch zips makefile to properly use private variables" into main am: 4caa319d am: 30d7c0b8

Original change: https://android-review.googlesource.com/c/platform/build/+/3101478



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