Merge "Code dump with latest updates." into udc-mainline-prod
diff --git a/Android.bp b/Android.bp
index d52d055..a49ddf9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,7 +62,7 @@
],
libs: [
- "ub-uiautomator",
+ "androidx.test.uiautomator_uiautomator",
"androidx.test.ext.truth",
"androidx.test.rules",
"androidx.annotation_annotation",
diff --git a/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java b/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
index c172205..7de85c2 100644
--- a/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
+++ b/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
@@ -24,10 +24,10 @@
import android.content.Context;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
import android.util.Pair;
import androidx.test.core.app.ApplicationProvider;
+import androidx.test.uiautomator.UiDevice;
import com.google.android.libraries.mobiledatadownload.file.common.LimitExceededException;
import com.google.common.io.BaseEncoding;
import com.google.common.io.ByteStreams;
diff --git a/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java b/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
index e3976c7..433a7aa 100644
--- a/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
+++ b/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
@@ -23,8 +23,8 @@
import android.content.Context;
import android.os.Build.VERSION;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
+import androidx.test.uiautomator.UiDevice;
import com.google.mobiledatadownload.internal.MetadataProto.BaseFile;
import com.google.mobiledatadownload.internal.MetadataProto.DataFile;
import com.google.mobiledatadownload.internal.MetadataProto.DataFileGroupInternal;
