[automerger skipped] Handle universal APK case in extract_apks am: 591e59e5 am: 91283584 -s ours

am skip reason: Change-Id I5ac64c845328a54024171da41c369050243462b0 with SHA-1 06fcac6f is in history

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

Change-Id: I94720a8f5e229ea66b221b699594b3a0880b46eb