[automerger skipped] Use unzip -DD am: 774a7580 -s ours am: aab63768 -s...

[automerger skipped] Use unzip -DD am: 774a7580 -s ours am: aab63768 -s ours am: e3d720db -s ours

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

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

Change-Id: I2fd2e808cc293c77b407cf2e024e97e73eb09cee