Converting tests to Androidx

Bug: 112610679
Change-Id: I712826e668f1fbeb4e47cc541d4f5296d8eb74c0
diff --git a/tests/Android.mk b/tests/Android.mk
index 03cb154..8e1f293 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,8 +18,8 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_STATIC_JAVA_LIBRARIES := \
-	android-support-test \
-	ub-uiautomator \
+	androidx-test \
+	androidx.test.uiautomator_uiautomator \
 	mockito-target-minus-junit4 \
 	ub-launcher-aosp-tapl
 
@@ -41,8 +41,8 @@
 include $(CLEAR_VARS)
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	androidx.annotation_annotation \
-	android-support-test \
-	ub-uiautomator \
+	androidx-test \
+	androidx.test.uiautomator_uiautomator \
 	libSharedSystemUI
 
 LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \