Merge "Exclude user build devices for the test" into main am: 3f8cb43ff1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871069

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

nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java

@@ -193,6 +193,11 @@ public class ChreDiscoveryProviderTest {
     @Test
     @SdkSuppress(minSdkVersion = 32, codeName = "T")
     public void testOnNearbyDeviceDiscoveredWithDataElements_TIME() {
+        // The feature only supports user-debug builds.
+        if (!Build.isDebuggable()) {
+            return;
+        }
+
         // Disables the setting of test app support
         boolean isSupportedTestApp = getDeviceConfigBoolean(
                 NEARBY_SUPPORT_TEST_APP, false /* defaultValue */);