Snap for 9849129 from 1662d7e8212bb7cc75459ed8b95f256b6be3963c to udc-release

Change-Id: I8d6043ce6f6dcf4c16d1977b3ad5c91be38e28ab

Android.bp

diff --git a/Android.bp b/Android.bp
index ad7cbe8..6895247 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_app {
+android_test {
     name: "mobly-bundled-snippets",
     static_libs: [
         "androidx.test.runner",

src/main/AndroidManifest.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 21de6d7..795c063 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -29,8 +29,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
-    <application android:allowBackup="false"
-                 android:name="androidx.multidex.MultiDexApplication">
+    <application>
         <meta-data
             android:name="mobly-snippets"
             android:value="com.google.android.mobly.snippet.bundled.AccountSnippet,