Migrate packages/providers/BlockedNumberProvider to androidx.test
am: 766c8fd0db

Change-Id: If82be73a813f83e341992ac0a9989fbecad30bc1
diff --git a/tests/Android.bp b/tests/Android.bp
index e4e57ed..2656ffa 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -2,7 +2,7 @@
     name: "BlockedNumberProviderTest",
     static_libs: [
         "mockito-target-minus-junit4",
-        "android-support-test",
+        "androidx.test.rules",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4c00887..1535ce4 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -30,7 +30,7 @@
     </application>
 
     <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.providers.blockednumber"
         android:label="Blocked Numbers Tests">
     </instrumentation>
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index deec903..b9d5ebe 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -22,7 +22,7 @@
     <option name="test-tag" value="BlockedNumberProviderTest" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.providers.blockednumber.tests" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
     </test>
 </configuration>