Merge "Revert "Fix signing failure for split APKs"" into main am: 8a3f6256

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



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