VrCpuTest - On Vr high performance devices, remove need for exclusive core
Bug: b/34973979

VrDisplayTest -Increase max display length to be 6.3 inches for bezel'less devices
Bug: b/62619244

Change-Id: Id30cf850f8ae840a9bd4cefd46138fd484cd6ad5
(cherry picked from commit dbf28bf616e859b17e59c43ab96f565413d8c78d)
diff --git a/tests/vr/src/android/vr/cts/VrCpuTest.java b/tests/vr/src/android/vr/cts/VrCpuTest.java
index f015899..8bc1aec 100644
--- a/tests/vr/src/android/vr/cts/VrCpuTest.java
+++ b/tests/vr/src/android/vr/cts/VrCpuTest.java
@@ -33,13 +33,4 @@
             assertTrue(Runtime.getRuntime().availableProcessors() >= 2);
         }
     }
-
-    public void testHasExclusiveCores() {
-        mActivity = getActivity();
-        if (mActivity.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE)) {
-            int[] excl_cores = Process.getExclusiveCores();
-            assertTrue(excl_cores.length >= 1);
-        }
-    }
 }
diff --git a/tests/vr/src/android/vr/cts/VrDisplayTest.java b/tests/vr/src/android/vr/cts/VrDisplayTest.java
index b26f4ed..9459e9c 100644
--- a/tests/vr/src/android/vr/cts/VrDisplayTest.java
+++ b/tests/vr/src/android/vr/cts/VrDisplayTest.java
@@ -116,6 +116,6 @@
         double diagonalLength = Math.sqrt(width * width + height * height);
 
         assertTrue(diagonalLength >= 4.7);
-        assertTrue(diagonalLength <= 6.);
+        assertTrue(diagonalLength <= 6.3);
     }
 }