Merge "add support for escaping for zip2zip" am: 75ebf1ba am: 9906c02d am: 308262ec

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



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