Merge "Atest: Fix arg completion issue" am: 856763c71b am: e6183aa233

Original change: https://android-review.googlesource.com/c/platform/tools/asuite/+/2038283

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