Merge "Correct the autoconnect for acloud list." am: 8057187f58

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

Change-Id: Icfdd836763867efb4cdea870d925403a7f912bce