From eb54d6a51a494ab51ae6fe4708c1db2c60fec541 Mon Sep 17 00:00:00 2001
From: Material Design Team <noreply@google.com>
Date: Wed, 8 Jun 2022 10:21:54 -0700
Subject: [PATCH] Update Appcompat and Emoji2 libraries from
 aosp-androidx-g3-release with build id #8479725

Android build branch: aosp-androidx-g3-release
Android build id: 8479725
Android build target: androidx
Auto generated by Argon artifacts pipeline

BEGIN_PUBLIC
...Update Appcompat and Emoji2 libraries...
END_PUBLIC

RELNOTES:N/A
PiperOrigin-RevId: 453710558
---
 .../io/material/catalog/color/AndroidManifest.xml        | 9 +++++++++
 .../android/material/testapp/theme/AndroidManifest.xml   | 2 +-
 .../google/android/material/theme/AndroidManifest.xml    | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/catalog/androidTest/javatests/io/material/catalog/color/AndroidManifest.xml b/catalog/androidTest/javatests/io/material/catalog/color/AndroidManifest.xml
index 8a0d716329c..89adf212a9a 100644
--- a/catalog/androidTest/javatests/io/material/catalog/color/AndroidManifest.xml
+++ b/catalog/androidTest/javatests/io/material/catalog/color/AndroidManifest.xml
@@ -15,12 +15,21 @@
   ~  limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   package="io.material.catalog.color.tests">
 
   <uses-sdk android:minSdkVersion="14" />
 
   <application>
     <uses-library android:name="android.test.runner" />
+    <provider
+    android:name="androidx.startup.InitializationProvider"
+    android:exported="false"
+    tools:node="remove"/>
+    <provider
+    android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
+    android:exported="false"
+    tools:node="remove"/>
   </application>
 
   <instrumentation
diff --git a/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml b/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml
index ae0004c0be8..b00dc3c55fc 100644
--- a/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml
+++ b/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml
@@ -18,7 +18,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   package="com.google.android.material.testapp.theme">
 
-  <uses-sdk
+  <uses-sdk android:minSdkVersion="14"
     tools:overrideLibrary="androidx.test, android.app, androidx.test.rule, androidx.test.espresso, androidx.test.espresso.idling"/>
 
   <application
diff --git a/tests/javatests/com/google/android/material/theme/AndroidManifest.xml b/tests/javatests/com/google/android/material/theme/AndroidManifest.xml
index b37efeae8df..7c01a138961 100644
--- a/tests/javatests/com/google/android/material/theme/AndroidManifest.xml
+++ b/tests/javatests/com/google/android/material/theme/AndroidManifest.xml
@@ -19,6 +19,7 @@
   package="com.google.android.material.tabs">
 
   <uses-sdk
+    android:minSdkVersion="14"
     tools:overrideLibrary="androidx.test, android.app, androidx.test.rule,
         androidx.test.espresso, androidx.test.espresso.idling"/>