Merge "Fix debugging payload command" am: 1d2853fe5d am: 5629db2020

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2505679

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