Merge "Revert "Fix problem of RepackApexPayload when using option...

Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb0

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



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