Merge "Fix error in payload_signer_args passing" into main am: 703b4830 am: 323c046d

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



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