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

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

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



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