Snap for 10453563 from 644ff81ea4a8569a1bb6dcf967ba5dda6e1805e2 to mainline-appsearch-release

Change-Id: I20cd7f2d48d7a4ac529125652f9cf237bff33f57

Android.bp

diff --git a/Android.bp b/Android.bp
index 8f2a5d2..6895247 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,13 +16,13 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_library {
+android_test {
     name: "mobly-bundled-snippets",
     static_libs: [
         "androidx.test.runner",
+        "gson",
         "guava",
         "mobly-snippet-lib",
-        "gson-prebuilt-jar",
     ],
     srcs: [
         "src/main/**/*.java",

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,