Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils"

tests/ActivityManagerPerfTests/utils/Android.bp

@@ -32,6 +32,6 @@ java_test {
     static_libs: [
         "androidx.test.rules",
         "junit",
-        "ub-uiautomator",
+        "androidx.test.uiautomator_uiautomator",
     ],
 }

tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java

@@ -19,10 +19,10 @@ package com.android.frameworks.perftests.am.util;
 import android.content.Intent;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
-import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
 
 import java.io.IOException;