CameraITS: relax edge enhancement test a bit

Also fix a ">" versus ">=" bug in caps.py

Bug: 30293800
Bug: 30315817
Change-Id: Ie4ec4a2118182c72f356e939f99cd3591da182eb
diff --git a/apps/CameraITS/pymodules/its/caps.py b/apps/CameraITS/pymodules/its/caps.py
index 94b12f5..a33757d 100644
--- a/apps/CameraITS/pymodules/its/caps.py
+++ b/apps/CameraITS/pymodules/its/caps.py
@@ -47,7 +47,7 @@
     """
     return props.has_key("android.info.supportedHardwareLevel") and \
             props["android.info.supportedHardwareLevel"] != 2 and \
-            props["android.info.supportedHardwareLevel"] > 1
+            props["android.info.supportedHardwareLevel"] >= 1
 
 def level3(props):
     """Returns whether a device is a LEVEL3 capability camera2 device.
diff --git a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
index 8ab0c02..3bd4b34 100644
--- a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
@@ -90,7 +90,7 @@
     the sharpess of non-reprocess images.
     """
 
-    THRESHOLD_RELATIVE_SHARPNESS_DIFF = 0.1
+    THRESHOLD_RELATIVE_SHARPNESS_DIFF = 0.15
 
     with its.device.ItsSession() as cam:
         props = cam.get_camera_properties()