Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9 am: 089f7d6380 am: dfe7fc99a3

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

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

packages/SystemUI/Android.bp

@@ -221,7 +221,7 @@ android_library {
         "metrics-helper-lib",
         "hamcrest-library",
         "androidx.test.rules",
-        "androidx.test.uiautomator",
+        "androidx.test.uiautomator_uiautomator",
         "mockito-target-extended-minus-junit4",
         "testables",
         "truth-prebuilt",

tests/TrustTests/Android.bp

@@ -24,7 +24,7 @@ android_test {
     static_libs: [
         "androidx.test.rules",
         "androidx.test.ext.junit",
-        "androidx.test.uiautomator",
+        "androidx.test.uiautomator_uiautomator",
         "mockito-target-minus-junit4",
         "servicestests-utils",
         "truth-prebuilt",