Merge "Mark test as flaky to unblock presubmits." into main am: e701119e am: 249f348c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2794895



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

core/tests/coretests/src/android/provider/DeviceConfigTest.java

@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -743,6 +744,7 @@ public class DeviceConfigTest {
     }
 
     @Test
+    @FlakyTest(bugId = 299483542)
     public void onPropertiesChangedListener_setPropertiesCallback() {
         DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false);
         DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false);