Merge "Check if device is online before starting 16kb test" into main am: 7ee0e07a50 am: ca9409db6d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489997

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

tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java

@@ -51,7 +51,12 @@ public class Enable16KbTest extends BaseHostJUnit4Test {
     @Test
     @AppModeFull
     public void enable16KbToggle() throws Exception {
-        assertTrue(isPackageInstalled(APP_PACKAGE));
+        // Wait for 2 mins device to be online
+        getDevice().waitForDeviceOnline(120000);
+        if (!isPackageInstalled(APP_PACKAGE)) {
+            //If test app has failed for some reason, retry installation
+            installTestApp();
+        }
 
         // Check if developer option is enabled otherwise exit
         getDevice().enableAdbRoot();