diff --git a/build_extensions/AndroidManifest_robolectric.xml b/build_extensions/AndroidManifest_robolectric.xml
index 56d70f245..4685d5733 100644
--- a/build_extensions/AndroidManifest_robolectric.xml
+++ b/build_extensions/AndroidManifest_robolectric.xml
@@ -18,7 +18,7 @@
package="androidx.test.robolectric" >
diff --git a/build_extensions/AndroidManifest_target_stub.xml b/build_extensions/AndroidManifest_target_stub.xml
index 552adedcf..1a520ad8d 100644
--- a/build_extensions/AndroidManifest_target_stub.xml
+++ b/build_extensions/AndroidManifest_target_stub.xml
@@ -18,7 +18,7 @@
package="${applicationId}" >
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index a1e731bc3..f865ebbb0 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -12,6 +12,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/core/java/androidx/test/core/AndroidManifest.xml b/core/java/androidx/test/core/AndroidManifest.xml
index 86907eba3..692342834 100644
--- a/core/java/androidx/test/core/AndroidManifest.xml
+++ b/core/java/androidx/test/core/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.core" >
diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_target.xml b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
index 2a10f0fd2..cc9ccbbbf 100644
--- a/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
+++ b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
@@ -18,7 +18,7 @@
package="androidx.test.core.app" >
diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_test.xml b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
index 36df0dd8f..8935f2d73 100644
--- a/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
+++ b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
@@ -18,7 +18,7 @@
package="androidx.test.core.app.test" >
diff --git a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
index 6bc4aaa25..87340d09c 100644
--- a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
+++ b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.test.core.app.testing">
+ android:minSdkVersion="23"/>
+ android:minSdkVersion="23"/>
diff --git a/espresso/CHANGELOG.md b/espresso/CHANGELOG.md
index a60a5d4aa..2ea894b34 100644
--- a/espresso/CHANGELOG.md
+++ b/espresso/CHANGELOG.md
@@ -22,6 +22,8 @@ The following artifacts were released:
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
index 92b3e4816..89b9c7b1c 100644
--- a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.accessibility" >
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
index 7032445db..221ee4e85 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.contrib" >
diff --git a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
index b157f4fa6..7bd15762b 100644
--- a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
+++ b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.core" >
diff --git a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
index 24b639f16..7e40ca101 100644
--- a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
+++ b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.remote" >
diff --git a/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml
index 64e038cf2..239a6ba37 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml
+++ b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.action" >
diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
index 8e6a2b2c4..40868ee00 100644
--- a/espresso/device/CHANGELOG.md
+++ b/espresso/device/CHANGELOG.md
@@ -12,6 +12,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml
index b755aed92..2f8935a30 100644
--- a/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml
+++ b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml
@@ -21,7 +21,7 @@
\ No newline at end of file
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
index 555a2483d..7c00a74c6 100644
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.idling.concurrent" >
diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
index 4ed37e84b..96acd81b3 100644
--- a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
+++ b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.idling.concurrent"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
index 42ea4a754..effade7c9 100644
--- a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
+++ b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.idling.resource" >
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
index 3a93272bf..0b56363e7 100644
--- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
@@ -18,6 +18,6 @@
package="androidx.test.espresso.idling.net" >
diff --git a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
index b1d325d3a..68a9de962 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
+++ b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.intent" >
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml
index f600b69be..26aedbba2 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.intents">
diff --git a/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml
index 24b639f16..7e40ca101 100644
--- a/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml
+++ b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.espresso.remote" >
diff --git a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
index 16fc2f2af..6a795549e 100644
--- a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
+++ b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.web" >
diff --git a/ext/junit/CHANGELOG.md b/ext/junit/CHANGELOG.md
index 6fba69f33..1e1d374e4 100644
--- a/ext/junit/CHANGELOG.md
+++ b/ext/junit/CHANGELOG.md
@@ -13,6 +13,8 @@ are released.
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
index 9ec9b348e..6c442b412 100644
--- a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
+++ b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
@@ -19,7 +19,7 @@
diff --git a/ext/truth/CHANGELOG.md b/ext/truth/CHANGELOG.md
index 28322cd03..f4cbfd414 100644
--- a/ext/truth/CHANGELOG.md
+++ b/ext/truth/CHANGELOG.md
@@ -15,6 +15,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
index 07577ba59..8e66c3929 100644
--- a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
+++ b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.ext.truth" >
diff --git a/gradle-tests/build.gradle b/gradle-tests/build.gradle
index e578e7389..b59c8810c 100644
--- a/gradle-tests/build.gradle
+++ b/gradle-tests/build.gradle
@@ -10,7 +10,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
}
ext {
- minSdk = 21
+ minSdk = 23
targetSdk = 34
compileSdk = 34
emulatorApi = 33
diff --git a/ktx/core/java/androidx/test/core/AndroidManifest.xml b/ktx/core/java/androidx/test/core/AndroidManifest.xml
index e5b547134..c3ed3734a 100644
--- a/ktx/core/java/androidx/test/core/AndroidManifest.xml
+++ b/ktx/core/java/androidx/test/core/AndroidManifest.xml
@@ -17,6 +17,6 @@
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
index 1aaec6a4e..5002b04f1 100644
--- a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
@@ -17,6 +17,6 @@
diff --git a/runner/android_junit_runner/CHANGELOG.md b/runner/android_junit_runner/CHANGELOG.md
index 0e374a29f..3955a65db 100644
--- a/runner/android_junit_runner/CHANGELOG.md
+++ b/runner/android_junit_runner/CHANGELOG.md
@@ -12,6 +12,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
index a72116a12..cd1a0e574 100644
--- a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
+++ b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
@@ -23,7 +23,7 @@
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml
index 0917aa110..efdc715db 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.internal.runner"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml
index 08c093c17..e435c3ede 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml
@@ -21,7 +21,7 @@
-
+
-
+
diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md
index 7f878d05b..28044f31c 100644
--- a/runner/monitor/CHANGELOG.md
+++ b/runner/monitor/CHANGELOG.md
@@ -15,6 +15,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/runner/monitor/java/androidx/test/AndroidManifest.xml b/runner/monitor/java/androidx/test/AndroidManifest.xml
index 7db4f13a5..fbebbbcf8 100644
--- a/runner/monitor/java/androidx/test/AndroidManifest.xml
+++ b/runner/monitor/java/androidx/test/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.monitor" >
diff --git a/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml
index 341d3a1a1..fbf9c0f63 100644
--- a/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml
+++ b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.monitor.tests"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml
index b5dc87327..559da6ab1 100644
--- a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.platform.view.inspector.fixtures"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/runner/rules/CHANGELOG.md b/runner/rules/CHANGELOG.md
index 1838b630b..c952041b2 100644
--- a/runner/rules/CHANGELOG.md
+++ b/runner/rules/CHANGELOG.md
@@ -12,6 +12,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/runner/rules/java/androidx/test/AndroidManifest.xml b/runner/rules/java/androidx/test/AndroidManifest.xml
index 09a72a898..46610f22e 100644
--- a/runner/rules/java/androidx/test/AndroidManifest.xml
+++ b/runner/rules/java/androidx/test/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.rules" >
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml
index 55e42f7c7..ef026209d 100644
--- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml
@@ -18,7 +18,7 @@
package="androidx.test.rule"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml
index 749ca335f..ac9b03123 100644
--- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml
@@ -18,7 +18,7 @@
package="androidx.test.rule"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml
index 9c3195655..751fb2dd6 100644
--- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml
@@ -18,7 +18,7 @@
package="androidx.test.rule"
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
diff --git a/services/AndroidManifest.xml b/services/AndroidManifest.xml
index cf6908cd1..643433af3 100644
--- a/services/AndroidManifest.xml
+++ b/services/AndroidManifest.xml
@@ -22,7 +22,7 @@
android:versionName="${appVersion}">
diff --git a/services/CHANGELOG.md b/services/CHANGELOG.md
index 90e6792cc..8bb407f22 100644
--- a/services/CHANGELOG.md
+++ b/services/CHANGELOG.md
@@ -12,6 +12,8 @@
**API Changes**
+* Update to minSdkVersion 23
+
**Breaking API Changes**
**Known Issues**
diff --git a/services/events/javatests/androidx/test/services/events/internal/BUILD b/services/events/javatests/androidx/test/services/events/internal/BUILD
index ece057599..5dd70e21c 100644
--- a/services/events/javatests/androidx/test/services/events/internal/BUILD
+++ b/services/events/javatests/androidx/test/services/events/internal/BUILD
@@ -15,7 +15,7 @@ axt_android_local_test(
"StackTrimmerTest.java",
],
manifest_values = {
- "minSdkVersion": "21",
+ "minSdkVersion": "23",
},
deps = [
"//ext/junit",
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
index 644d4d28a..5c8864775 100644
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.services.shellexecutor" >
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
index 09427e1df..c405a1965 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.services.speakeasy.server">
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
index 3d137e9c6..82878c248 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.services.speakeasy.client" >
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
index 0deec6d8b..38e7b1503 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
@@ -20,7 +20,7 @@
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
index b5f137434..6a6e89b41 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.services.speakeasy.server" >
diff --git a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
index 610024902..a8fe993fe 100644
--- a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
+++ b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.services.storage" >
diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
index a6965eed0..d0ad262a4 100644
--- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
+++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
@@ -25,7 +25,7 @@
-
diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
index 9cfd48128..a661da6d4 100644
--- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
+++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
@@ -52,6 +52,6 @@
+ android:minSdkVersion="23" />
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
index 4f5d03e8e..251066e28 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
+++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.services.storage.provider">
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
index e432946b1..ae00e6baf 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
+++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
@@ -18,7 +18,7 @@
package="androidx.test.services.storage.provider">
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml
index 68163d206..ba202baa4 100644
--- a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml
@@ -20,7 +20,7 @@
package="androidx.test.foldable.app">
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml
index 06e148562..cc4510fd8 100644
--- a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml
@@ -20,7 +20,7 @@
package="androidx.test.foldable.app">
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
index 14085cba4..b96932b45 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.ui.app">
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
index 78cefeb79..826812b48 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
@@ -18,7 +18,7 @@
package="androidx.test.ui.app">
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
index 8bd6e1c46..1ee68b853 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="androidx.test.ui.app.tests" >