Snap for 10130956 from 7babb67b4551f59cb933205865a787adb1d7ac6e to udc-qpr1-release

Change-Id: I096700e529ef06b61cb950b61b3f186ba5707133
diff --git a/tests/bluetooth/src/android/bluetooth/cts_root/BluetoothCddRootTest.java b/tests/bluetooth/src/android/bluetooth/cts_root/BluetoothCddRootTest.java
index 97504e8..41e8433 100644
--- a/tests/bluetooth/src/android/bluetooth/cts_root/BluetoothCddRootTest.java
+++ b/tests/bluetooth/src/android/bluetooth/cts_root/BluetoothCddRootTest.java
@@ -114,11 +114,18 @@
         // TODO: Enforce LE data length extension
     }
 
-    @CddTest(requirements = {"7.4.3/C-3-6"})
+    @CddTest(requirements = {"7.4.3/H-1-1"})
     @Test
-    public void test_C_5_1_AshaRequirements() {
+    public void test_H_1_1_AshaRequirements() {
         Assume.assumeTrue(mHasBluetooth);
-        Assume.assumeTrue(TestUtils.isBleSupported(mContext));
+        Assume.assumeTrue("Skip 7.4.3/H-1-1 test for non-BLE devices",
+                TestUtils.isBleSupported(mContext));
+        Assume.assumeFalse("Skip 7.4.3/H-1-1 test for automotive devices",
+                TestUtils.isAutomotive(mContext));
+        Assume.assumeFalse("Skip 7.4.3/H-1-1 test for watch devices",
+                TestUtils.isWatch(mContext));
+        Assume.assumeFalse("Skip 7.4.3/H-1-1 test for TV devices",
+                TestUtils.isTv(mContext));
         AtomsProto.BluetoothLocalVersionsReported version = getBluetoothVersion();
         Assume.assumeTrue(version.hciVersion >= BLUETOOTH_CORE_SPECIFICATION_5_0);
         assertThat(BTAdapterUtils.enableAdapter(mAdapter, mContext)).isTrue();