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

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



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