Merge "Workaround to use launch_cvd as default option" am: 43223f26d7

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2331603

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