cros_run_bvt: Run labqual autotest suite

Previously, bvt-{inline,cq,faft} suites were run for labqual.
Labqual is being narrowed to just tests that are critical for lab
stability. Just run the new labqual autotest suite.

Remove usbkey flag because many labqual tests rely on usbkey,
so this dependency can't be avoided.

BUG=b:155173602
TEST=none

Cq-Depend: chromium:2393117
Change-Id: I67773c50ad8c1bc364d585535540679cc352ed58
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crostestutils/+/2490466
Tested-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>
Reviewed-by: Philip Chen <philipchen@chromium.org>
Commit-Queue: Rob Barnes <robbarnes@google.com>
diff --git a/cros_run_bvt b/cros_run_bvt
index 6169518..06fa021 100755
--- a/cros_run_bvt
+++ b/cros_run_bvt
@@ -29,8 +29,6 @@
 
 # These options only matter if we're using Servo, which only
 # happens when --labqual is specified.
-DEFINE_boolean usbkey "${FLAGS_TRUE}" \
-  "When running servo tests, assume a USB storage key is plugged in"
 DEFINE_string servo_host "" \
   "When running servo tests, specifies the host running servod"
 DEFINE_string servo_port "" \
@@ -52,7 +50,7 @@
 
 DUT="$1"
 OPTIONS=( --board="${FLAGS_board}" )
-TESTS=( suite:bvt-{inline,cq,perbuild} )
+TESTS=( suite:bvt-{inline,cq,perbuild,labqual} )
 
 SUITE_CHECK=0
 if [ ${FLAGS_smoke} -eq ${FLAGS_TRUE} ]; then
@@ -69,12 +67,7 @@
 fi
 if [ ${FLAGS_labqual} -eq ${FLAGS_TRUE} ]; then
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
-  TESTS=( suite:bvt-{inline,cq,faft} )
-  if [ ${FLAGS_usbkey} -eq ${FLAGS_TRUE} ]; then
-    TESTS+=( platform_ServoPowerStateController.USBPluggedin )
-  else
-    TESTS+=( platform_ServoPowerStateController.USBUnplugged )
-  fi
+  TESTS=( suite:labqual)
 
   # Handle Servo options for the lab qualification tests.
   if [ -n "${FLAGS_servo_host}" ]; then