Ensure VTS collector check for availability

Test: unit tests
Bug: 231971525
Change-Id: I6be09fa134d796f67dec15c38720cea4d3e08210
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
index de1f765..256d7fd 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
@@ -92,6 +92,8 @@
             throws TargetSetupError, BuildError, DeviceNotAvailableException {
         ITestDevice device = testInfo.getDevice();
         IBuildInfo buildInfo = testInfo.getBuildInfo();
+        // Ensure device is available before collecting
+        device.waitForDeviceAvailable();
         for (Entry<String, String> entry : BUILD_KEYS.entrySet()) {
             String propertyValue = device.getProperty(entry.getValue());
             if ((propertyValue == null || propertyValue.length() == 0)