[automerger skipped] Use unzip -DD am: 774a758026 -s ours

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

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

Change-Id: I9bb5bf7656e56950af540e4752dc352049ac8312