Merge "Disable eager initialization of Jetpack libraries"

AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="com.android.settings"
           coreApp="true"
           android:sharedUserId="android.uid.system">
@@ -4651,6 +4652,12 @@
             </intent-filter>
         </activity>
 
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>

tests/unit/AndroidManifest.xml

@@ -74,8 +74,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove"
-            tools:replace="android:authorities"/>
+            tools:node="remove"/>
 
     </application>