Fix SysSetting Tests

Test: make AndroidBvtTests -j40
Bug:32700150
Change-Id: I2c54059bc191f4ea247dc38b0903eed6dca3adfb
(cherry picked from commit 492ec6980cbb757807938bb05682b75cc774449b)
diff --git a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
index 4956370..cbbc3ff 100644
--- a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
+++ b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
@@ -502,9 +502,9 @@
         boolean verifyOn = false;
         launchQuickSettingsAndWait();
         UiObject2 flashLight = mDevice.wait(
-                Until.findObject(By.descContains(FLASHLIGHT)),
+                Until.findObject(By.desc(FLASHLIGHT)),
                 TIMEOUT * 3);
-        if (flashLight.getText().equals(lightOn)) {
+        if (flashLight != null && flashLight.getText().equals(lightOn)) {
             verifyOn = true;
         }
         mDevice.wait(Until.findObject(By.textContains(FLASHLIGHT)),
@@ -539,6 +539,6 @@
 
     public void launchQuickSettingsAndWait() throws Exception {
         mDevice.openQuickSettings();
-        Thread.sleep(TIMEOUT);
+        Thread.sleep(TIMEOUT * 2);
     }
 }