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

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

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



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