Snap for 11224086 from 748311e0a4120c5c5361422efc3f42918ec0e668 to mainline-tzdata5-releaseaml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: I64297d17517ab574dd5b10261567c23606f8bbbf

71 files changed, 1407 insertions, 76 deletions

diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp
index d7a93db3..ab5fab2b 100644
--- a/common/androidx-media3/Android.bp
+++ b/common/androidx-media3/Android.bp
@@ -1,19 +1,26 @@
 // This is a generated file. Do not modify directly.
 // Automatically generated with:
-// pom2bp -rewrite 'androidx.media3:=androidx.media3.' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'androidx.annotation:annotation-experimental=androidx.annotation_annotation-experimental' -rewrite 'androidx.collection:collection=androidx.collection_collection' -rewrite 'androidx.media:media=androidx.media_media' -rewrite 'com.google.guava:guava=guava' -sdk-version current -static-deps -prepend prepend-license.txt .
+// pom2bp -rewrite 'androidx.media3:=androidx.media3.' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'androidx.annotation:annotation-experimental=androidx.annotation_annotation-experimental' -rewrite 'androidx.collection:collection=androidx.collection_collection' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.media:media=androidx.media_media' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'com.google.guava:guava=guava' -sdk-version current -static-deps -prepend prepend-license.txt .
 package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+library_visibility = [
+    "//vendor:__subpackages__",
+    "//cts/tests/tests/mediacujtest:__subpackages__",
+    "//cts/tests/tests/mediaediting",
+    "//packages/modules/AdServices/sdksandbox/tests/manual-test-apps:__subpackages__",
+]
+
 android_library_import {
     name: "androidx.media3.media3-common-nodeps",
-    aars: ["androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar"],
+    aars: ["androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "16",
+    min_sdk_version: "19",
     static_libs: [
         "guava",
         "androidx.annotation_annotation",
@@ -29,7 +36,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "16",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.media3.media3-common/AndroidManifest.xml",
     static_libs: [
         "androidx.media3.media3-common-nodeps",
@@ -38,18 +45,346 @@ android_library {
         "androidx.annotation_annotation-experimental",
     ],
     java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-container-nodeps",
+    aars: ["androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-container",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-container/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-container-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-database-nodeps",
+    aars: ["androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-database",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-database/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-database-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-datasource-nodeps",
+    aars: ["androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-database",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-datasource",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-datasource/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-datasource-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-database",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-decoder-nodeps",
+    aars: ["androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
     visibility: ["//visibility:private"]
 }
 
+android_library {
+    name: "androidx.media3.media3-decoder",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-decoder/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-decoder-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-effect-nodeps",
+    aars: ["androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-datasource",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-effect",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-effect/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-effect-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-datasource",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-exoplayer-dash-nodeps",
+    aars: ["androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-exoplayer",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-exoplayer-dash",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-exoplayer-dash/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-exoplayer-dash-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-exoplayer",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-exoplayer-nodeps",
+    aars: ["androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-datasource",
+        "androidx.media3.media3-decoder",
+        "androidx.media3.media3-extractor",
+        "androidx.media3.media3-database",
+        "androidx.core_core",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-exoplayer",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-exoplayer/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-exoplayer-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-datasource",
+        "androidx.media3.media3-decoder",
+        "androidx.media3.media3-extractor",
+        "androidx.media3.media3-database",
+        "androidx.core_core",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-extractor-nodeps",
+    aars: ["androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-decoder",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-extractor",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-extractor/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-extractor-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-decoder",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-muxer-nodeps",
+    aars: ["androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-muxer",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-muxer/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-muxer-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media3.media3-container",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
 android_library_import {
     name: "androidx.media3.media3-session-nodeps",
-    aars: ["androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar"],
+    aars: ["androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "16",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.collection_collection",
         "androidx.media3.media3-common",
@@ -65,7 +400,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "16",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.media3.media3-session/AndroidManifest.xml",
     static_libs: [
         "androidx.media3.media3-session-nodeps",
@@ -74,5 +409,85 @@ android_library {
         "androidx.media_media",
     ],
     java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-transformer-nodeps",
+    aars: ["androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "21",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-datasource",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-exoplayer",
+        "androidx.media3.media3-effect",
+        "androidx.media3.media3-muxer",
+    ],
+    visibility: ["//visibility:private"]
+}
+
+android_library {
+    name: "androidx.media3.media3-transformer",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "21",
+    manifest: "manifests/androidx.media3.media3-transformer/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-transformer-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-datasource",
+        "androidx.media3.media3-container",
+        "androidx.media3.media3-exoplayer",
+        "androidx.media3.media3-effect",
+        "androidx.media3.media3-muxer",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
+
+android_library_import {
+    name: "androidx.media3.media3-ui-nodeps",
+    aars: ["androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar"],
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media_media",
+        "androidx.recyclerview_recyclerview",
+    ],
     visibility: ["//visibility:private"]
 }
+
+android_library {
+    name: "androidx.media3.media3-ui",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "19",
+    manifest: "manifests/androidx.media3.media3-ui/AndroidManifest.xml",
+    static_libs: [
+        "androidx.media3.media3-ui-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.media3.media3-common",
+        "androidx.media_media",
+        "androidx.recyclerview_recyclerview",
+    ],
+    java_version: "1.7",
+    visibility: library_visibility
+}
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar
deleted file mode 100644
index c2e9663f..00000000
--- a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar
+++ /dev/null
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar
deleted file mode 100644
index 975482b9..00000000
--- a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar
+++ /dev/null
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar
new file mode 100644
index 00000000..c6450624
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar
new file mode 100644
index 00000000..495d6f63
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.pom b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.pom
index e8b703bd..ddffb923 100644
--- a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.pom
+++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.pom
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.media3</groupId>
   <artifactId>media3-common</artifactId>
-  <version>1.0.0-beta03</version>
+  <version>1.1.1</version>
   <packaging>aar</packaging>
   <name>Media3 common module</name>
   <description>Media3 common module</description>
@@ -33,112 +33,122 @@
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-cast</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>androidx.media3</groupId>
+        <artifactId>media3-container</artifactId>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-database</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-datasource</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-datasource-cronet</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-datasource-okhttp</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-datasource-rtmp</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-decoder</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-effect</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-dash</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-hls</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-ima</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-rtsp</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-smoothstreaming</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-exoplayer-workmanager</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-extractor</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>androidx.media3</groupId>
+        <artifactId>media3-muxer</artifactId>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-session</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-transformer</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-ui</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-ui-leanback</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-test-utils</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>androidx.media3</groupId>
         <artifactId>media3-test-utils-robolectric</artifactId>
-        <version>1.0.0-beta03</version>
+        <version>1.1.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -146,7 +156,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>31.0.1-android</version>
+      <version>31.1-android</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar
new file mode 100644
index 00000000..3d7f8eed
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar
new file mode 100644
index 00000000..70aca006
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.pom
new file mode 100644
index 00000000..9e5e1223
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-container</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 Container module</name>
+  <description>Media3 Container module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1-sources.jar
new file mode 100644
index 00000000..65def0c7
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar
new file mode 100644
index 00000000..b256e44a
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.pom
new file mode 100644
index 00000000..0e08279c
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-database</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 database module</name>
+  <description>Media3 database module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1-sources.jar
new file mode 100644
index 00000000..24532466
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar
new file mode 100644
index 00000000..fb435088
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.pom
new file mode 100644
index 00000000..2fe36089
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.pom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-datasource</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 DataSource module</name>
+  <description>Media3 DataSource module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-database</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1-sources.jar
new file mode 100644
index 00000000..e59f883e
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar
new file mode 100644
index 00000000..cbc13ee6
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.pom
new file mode 100644
index 00000000..70e0a102
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-decoder</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 decoder module</name>
+  <description>Media3 decoder module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar
new file mode 100644
index 00000000..7011bb96
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar
new file mode 100644
index 00000000..0c966250
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.pom
new file mode 100644
index 00000000..2c7e248d
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.pom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-effect</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 Effect module</name>
+  <description>Media3 Effect module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-datasource</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar
new file mode 100644
index 00000000..7974e68f
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar
new file mode 100644
index 00000000..3f6e6d15
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.pom
new file mode 100644
index 00000000..f6e0c628
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-exoplayer-dash</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 ExoPlayer DASH module</name>
+  <description>Media3 ExoPlayer DASH module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-exoplayer</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar
new file mode 100644
index 00000000..161f75ce
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar
new file mode 100644
index 00000000..1aba21b9
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.pom
new file mode 100644
index 00000000..db292d24
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.pom
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-exoplayer</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 ExoPlayer module</name>
+  <description>Media3 ExoPlayer module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-container</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-datasource</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-decoder</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-extractor</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-database</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.8.0</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1-sources.jar
new file mode 100644
index 00000000..69bd8641
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar
new file mode 100644
index 00000000..8e428acd
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.pom
new file mode 100644
index 00000000..d1cc5abb
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-extractor</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 Extractor module</name>
+  <description>Media3 Extractor module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-container</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-decoder</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar
new file mode 100644
index 00000000..b7fab239
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar
new file mode 100644
index 00000000..63b5f77b
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom
new file mode 100644
index 00000000..846735e6
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-muxer</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 Muxer module</name>
+  <description>Media3 Muxer module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-container</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar
deleted file mode 100644
index d3a4b9eb..00000000
--- a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar
+++ /dev/null
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar
deleted file mode 100644
index 804b0319..00000000
--- a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar
+++ /dev/null
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar
new file mode 100644
index 00000000..ff559738
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar
new file mode 100644
index 00000000..e2adb991
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.pom b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.pom
index b889125a..4662732c 100644
--- a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.pom
+++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.pom
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.media3</groupId>
   <artifactId>media3-session</artifactId>
-  <version>1.0.0-beta03</version>
+  <version>1.1.1</version>
   <packaging>aar</packaging>
   <name>Media3 Session module</name>
   <description>Media3 Session module</description>
@@ -32,14 +32,14 @@
     <dependency>
       <groupId>androidx.media3</groupId>
       <artifactId>media3-common</artifactId>
-      <version>1.0.0-beta03</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
       <type>aar</type>
     </dependency>
     <dependency>
       <groupId>androidx.collection</groupId>
       <artifactId>collection</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar
new file mode 100644
index 00000000..51a6d512
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar
new file mode 100644
index 00000000..87066fb7
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom
new file mode 100644
index 00000000..76295749
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-transformer</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 Transformer module</name>
+  <description>Media3 Transformer module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-datasource</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-container</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-exoplayer</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-effect</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-muxer</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar
new file mode 100644
index 00000000..4504cbbb
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar
diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar
new file mode 100644
index 00000000..968c9868
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar
diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.pom
new file mode 100644
index 00000000..fde45f98
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>androidx.media3</groupId>
+  <artifactId>media3-ui</artifactId>
+  <version>1.1.1</version>
+  <packaging>aar</packaging>
+  <name>Media3 UI module</name>
+  <description>Media3 UI module</description>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/androidx/media.git</connection>
+    <url>https://github.com/androidx/media</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.media3</groupId>
+      <artifactId>media3-common</artifactId>
+      <version>1.1.1</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.media</groupId>
+      <artifactId>media</artifactId>
+      <version>1.6.0</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.recyclerview</groupId>
+      <artifactId>recyclerview</artifactId>
+      <version>1.3.0</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-container/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-container/AndroidManifest.xml
new file mode 100644
index 00000000..5f4f689f
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-container/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.container" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-database/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-database/AndroidManifest.xml
new file mode 100644
index 00000000..173cd75e
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-database/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.database" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-datasource/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-datasource/AndroidManifest.xml
new file mode 100644
index 00000000..50987ba5
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-datasource/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.datasource" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-decoder/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-decoder/AndroidManifest.xml
new file mode 100644
index 00000000..fbc2b51e
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-decoder/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.decoder" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-effect/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-effect/AndroidManifest.xml
new file mode 100644
index 00000000..77209370
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-effect/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.effect" >
+
+    <uses-sdk
+        android:minSdkVersion="18"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-exoplayer-dash/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-exoplayer-dash/AndroidManifest.xml
new file mode 100644
index 00000000..1fd9125c
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-exoplayer-dash/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.exoplayer.dash" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-exoplayer/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-exoplayer/AndroidManifest.xml
new file mode 100644
index 00000000..386d6d05
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-exoplayer/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.exoplayer" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-extractor/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-extractor/AndroidManifest.xml
new file mode 100644
index 00000000..89b5eb79
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-extractor/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.extractor" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml
new file mode 100644
index 00000000..bea24c29
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.muxer" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-transformer/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-transformer/AndroidManifest.xml
new file mode 100644
index 00000000..902260fb
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-transformer/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.transformer" >
+
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-ui/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-ui/AndroidManifest.xml
new file mode 100644
index 00000000..3c9d28ab
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-ui/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.ui" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/update-from-gmaven.py b/common/androidx-media3/update-from-gmaven.py
index 28180ee2..5c6b3799 100755
--- a/common/androidx-media3/update-from-gmaven.py
+++ b/common/androidx-media3/update-from-gmaven.py
@@ -8,7 +8,8 @@
 #       * If this fails with 'fatal error: thread exhaustion'
 #         (and then an *enormous* thread dump), retry the command.
 #   b. Update the version numbers in this file (and ensure any new modules are added below)
-#   c. $ ./prebuilts/misc/common/androidx-media3/update-from-gmaven.py
+#   c. Run the script from the Android source root:
+#      $ ./prebuilts/misc/common/androidx-media3/update-from-gmaven.py
 #
 # The script will then:
 #   1. Remove the previous artifacts
@@ -20,14 +21,15 @@
 # The visibility restrictions in Android.bp must be manually restored.
 #
 # Manual verification steps:
-#   1. Build the imported modules, e.g.
-#      $ m androidx.media3.media3-common androidx.media3.media3-session
+#   1. Build the 'leaf' imported modules (i.e. the set that ends up depending
+#      on *everything* transitively), e.g.
+#      $ m androidx.media3.media3-exoplayer-dash androidx.media3.media3-exoplayer androidx.media3.media3-session androidx.media3.media3-transformer androidx.media3.media3-ui
 
 import os
 import subprocess
 import sys
 
-media3Version="1.0.0-beta03"
+media3Version="1.1.1"
 
 mavenToBpPatternMap = {
     "androidx.media3:" : "androidx.media3.",
@@ -101,7 +103,18 @@ cmd("rm -rf androidx/media3")
 cmd("rm -rf manifests")
 
 downloadArtifact("androidx.media3", "media3-common", media3Version)
+downloadArtifact("androidx.media3", "media3-container", media3Version)
+downloadArtifact("androidx.media3", "media3-database", media3Version)
+downloadArtifact("androidx.media3", "media3-datasource", media3Version)
+downloadArtifact("androidx.media3", "media3-decoder", media3Version)
+downloadArtifact("androidx.media3", "media3-effect", media3Version)
+downloadArtifact("androidx.media3", "media3-exoplayer", media3Version)
+downloadArtifact("androidx.media3", "media3-exoplayer-dash", media3Version)
+downloadArtifact("androidx.media3", "media3-extractor", media3Version)
+downloadArtifact("androidx.media3", "media3-muxer", media3Version)
 downloadArtifact("androidx.media3", "media3-session", media3Version)
+downloadArtifact("androidx.media3", "media3-transformer", media3Version)
+downloadArtifact("androidx.media3", "media3-ui", media3Version)
 
 atxRewriteStr = ""
 for name in mavenToBpPatternMap:
@@ -112,7 +125,9 @@ cmd("pom2bp " + atxRewriteStr +
     "-rewrite androidx.annotation:annotation=androidx.annotation_annotation " +
     "-rewrite androidx.annotation:annotation-experimental=androidx.annotation_annotation-experimental " +
     "-rewrite androidx.collection:collection=androidx.collection_collection " +
+    "-rewrite androidx.core:core=androidx.core_core " +
     "-rewrite androidx.media:media=androidx.media_media " +
+    "-rewrite androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview " +
     "-rewrite com.google.guava:guava=guava " +
     "-sdk-version current " +
     "-static-deps " +
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 07695dce..dcbe0e0e 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -22,7 +22,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.annotation_annotation",
         "androidx.annotation_annotation-experimental",
@@ -36,7 +36,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.annotation/AndroidManifest.xml",
     static_libs: [
         "androidx.test.annotation-nodeps",
@@ -98,7 +98,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "accessibility-test-framework",
         "androidx.test.espresso.core",
@@ -112,7 +112,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.accessibility/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.accessibility-nodeps",
@@ -130,7 +130,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "com.google.android.material_material",
         "androidx.recyclerview_recyclerview",
@@ -151,7 +151,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.contrib/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.contrib-nodeps",
@@ -176,7 +176,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.annotation_annotation",
         "javawriter",
@@ -199,7 +199,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.core/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.core-nodeps",
@@ -226,7 +226,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
     ],
 }
@@ -238,7 +238,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.idling-resource-nodeps",
@@ -254,7 +254,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "kotlin-stdlib",
         "androidx.test.espresso.core",
@@ -271,7 +271,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.intents/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.intents-nodeps",
@@ -292,7 +292,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.annotation_annotation",
         "tagsoup",
@@ -307,7 +307,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.espresso.web/AndroidManifest.xml",
     static_libs: [
         "androidx.test.espresso.web-nodeps",
@@ -326,7 +326,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "junit",
         "androidx.annotation_annotation",
@@ -342,7 +342,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.ext.junit/AndroidManifest.xml",
     static_libs: [
         "androidx.test.ext.junit-nodeps",
@@ -362,7 +362,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "guava",
         "truth-prebuilt",
@@ -379,7 +379,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.ext.truth/AndroidManifest.xml",
     static_libs: [
         "androidx.test.ext.truth-nodeps",
@@ -466,7 +466,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.test.runner",
         "androidx.test.annotation",
@@ -483,7 +483,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.rules/AndroidManifest.xml",
     static_libs: [
         "androidx.test.rules-nodeps",
@@ -504,7 +504,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.annotation_annotation",
         "androidx.tracing_tracing",
@@ -522,7 +522,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.runner/AndroidManifest.xml",
     static_libs: [
         "androidx.test.runner-nodeps",
@@ -544,7 +544,7 @@ android_library_import {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     static_libs: [
         "androidx.annotation_annotation",
         "jsr305",
@@ -560,7 +560,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     manifest: "manifests/androidx.test.services.storage/AndroidManifest.xml",
     static_libs: [
         "androidx.test.services.storage-nodeps",
diff --git a/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
index da6d25a2..558d97f0 100644
--- a/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.annotation" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="30" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
index 3f114f7e..dc53bf6b 100644
--- a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.core" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.REORDER_TASKS" />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
index b04d2b64..b2c22915 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.accessibility" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
     <application />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
index 602c3d31..e9ce730e 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.contrib" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
     <application />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
index 82f8cb05..34cd0b45 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.core" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
index 7a501297..9f6a0272 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.idling.resource" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
index 4794b778..865849d5 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.intent" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
index e258c4c7..0ddd389d 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.web" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
index ed2316c9..5730cf6c 100644
--- a/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.ext.junit" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
index 910000ac..49f499d6 100644
--- a/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.ext.truth" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
index 2cffb5c6..8f1623b1 100644
--- a/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.monitor" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
index 654fd761..8a156288 100644
--- a/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.rules" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
index 11755b38..94f4a6cd 100644
--- a/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.runner" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="30" />
 
     <queries>
diff --git a/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
index 7fdecc51..1b55ef18 100644
--- a/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.services.storage" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="30" />
 
 </manifest>
\ No newline at end of file