Merge "Suppress NightModeRltTest on API 15 and lower" into androidx-main

diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt
index 77ab362..d395ac9 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt

@@ -22,8 +22,8 @@
 import androidx.appcompat.app.NightModeCustomAttachBaseContextActivity.CUSTOM_LOCALE
 import androidx.appcompat.testutils.NightModeActivityTestRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
 import androidx.test.filters.MediumTest
+import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -38,6 +38,7 @@
  * <p>
  *
  */
+@SdkSuppress(minSdkVersion = 16)
 @MediumTest
 @RunWith(AndroidJUnit4::class)
 class NightModeRtlTestUtilsRegressionTestCase {
@@ -84,7 +85,6 @@
         restoreConfig?.invoke()
     }
 
-    @FlakyTest(bugId = 190529688)
     @Test
     @Suppress("DEPRECATION")
     fun testLocaleIsMaintained() {
@@ -94,7 +94,6 @@
         assertEquals(TextUtils.getLayoutDirectionFromLocale(CUSTOM_LOCALE), config.layoutDirection)
     }
 
-    @FlakyTest(bugId = 190529688)
     @Test
     fun testFontScaleIsMaintained() {
         // Check that the custom configuration properties are maintained