Merge "Fix signing failure for split APKs" into main am: 787d933f

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



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