[automerger skipped] Use unzip -DD am: 774a7580 am: 491a620b am:...

[automerger skipped] Use unzip -DD am: 774a7580 am: 491a620b am: 19b18c2c -s ours am: bc3847f8 -s ours

am skip reason: Change-Id I70407a627cb070e24be510faa6a774e3d9eae3a8 with SHA-1 774a7580 is in history

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

Change-Id: Ic4db197a8ad1154188c493310edcd51d2e20739e