Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I9d9e6b16fe91b52c8737948614c1fb4bbcf113fe
Change-Id: I6f5f5d15d99858ac9a18f499eafb339aaeef91b4

7 files changed, 133 insertions, 18 deletions

diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 12f57d6d..544032e4 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -46,6 +46,7 @@ android.hardware.graphics.common-V2-ndk(minSdkVersion:29)
 android.hardware.graphics.common-V2-ndk_platform(minSdkVersion:29)
 android.hardware.graphics.common-V3-ndk(minSdkVersion:29)
 android.hardware.graphics.common-V4-ndk(minSdkVersion:29)
+android.hardware.graphics.common-V5-ndk(minSdkVersion:29)
 android.hardware.graphics.common@1.0(minSdkVersion:29)
 android.hardware.graphics.common@1.1(minSdkVersion:29)
 android.hardware.graphics.common@1.2(minSdkVersion:29)
@@ -104,6 +105,7 @@ android.hardware.wifi.supplicant-V1.2-java(minSdkVersion:30)
 android.hardware.wifi.supplicant-V1.3-java(minSdkVersion:30)
 android.hardware.wifi.supplicant-V1.4-java(minSdkVersion:30)
 android.hardware.wifi.supplicant-V2-java(minSdkVersion:30)
+android.hardware.wifi.supplicant-V3-java(minSdkVersion:30)
 android.hidl.allocator@1.0(minSdkVersion:29)
 android.hidl.base-V1.0-java(minSdkVersion:current)
 android.hidl.manager-V1.0-java(minSdkVersion:30)
@@ -121,6 +123,7 @@ android.media.audio.common.types-V2-ndk(minSdkVersion:29)
 android.media.audio.common.types-V3-cpp(minSdkVersion:29)
 android.media.audio.common.types-V3-ndk(minSdkVersion:29)
 android.net.ipsec.ike.xml(minSdkVersion:(no version))
+android.permission.flags-aconfig-java(minSdkVersion:30)
 android.security.rkpd-ndk(minSdkVersion:33)
 android.security.rkpd-rust(minSdkVersion:33)
 android.system.suspend-V1-ndk(minSdkVersion:30)
@@ -132,6 +135,7 @@ androidx-constraintlayout_constraintlayout(minSdkVersion:19)
 androidx-constraintlayout_constraintlayout-core(minSdkVersion:24)
 androidx-constraintlayout_constraintlayout-solver(minSdkVersion:24)
 androidx.activity_activity(minSdkVersion:19)
+androidx.activity_activity-compose(minSdkVersion:21)
 androidx.activity_activity-ktx(minSdkVersion:19)
 androidx.annotation_annotation(minSdkVersion:24)
 androidx.annotation_annotation-experimental(minSdkVersion:19)
@@ -148,6 +152,37 @@ androidx.cardview_cardview(minSdkVersion:19)
 androidx.collection_collection(minSdkVersion:24)
 androidx.collection_collection-jvm(minSdkVersion:24)
 androidx.collection_collection-ktx(minSdkVersion:24)
+androidx.compose.animation_animation(minSdkVersion:21)
+androidx.compose.animation_animation-android(minSdkVersion:21)
+androidx.compose.animation_animation-core(minSdkVersion:21)
+androidx.compose.animation_animation-core-android(minSdkVersion:21)
+androidx.compose.foundation_foundation(minSdkVersion:21)
+androidx.compose.foundation_foundation-android(minSdkVersion:21)
+androidx.compose.foundation_foundation-layout(minSdkVersion:21)
+androidx.compose.foundation_foundation-layout-android(minSdkVersion:21)
+androidx.compose.material3_material3(minSdkVersion:21)
+androidx.compose.material3_material3-android(minSdkVersion:21)
+androidx.compose.material_material-icons-core(minSdkVersion:21)
+androidx.compose.material_material-icons-core-android(minSdkVersion:21)
+androidx.compose.material_material-ripple(minSdkVersion:21)
+androidx.compose.material_material-ripple-android(minSdkVersion:21)
+androidx.compose.runtime_runtime(minSdkVersion:21)
+androidx.compose.runtime_runtime-android(minSdkVersion:21)
+androidx.compose.runtime_runtime-livedata(minSdkVersion:21)
+androidx.compose.runtime_runtime-saveable(minSdkVersion:21)
+androidx.compose.runtime_runtime-saveable-android(minSdkVersion:21)
+androidx.compose.ui_ui(minSdkVersion:21)
+androidx.compose.ui_ui-android(minSdkVersion:21)
+androidx.compose.ui_ui-geometry(minSdkVersion:21)
+androidx.compose.ui_ui-geometry-android(minSdkVersion:21)
+androidx.compose.ui_ui-graphics(minSdkVersion:21)
+androidx.compose.ui_ui-graphics-android(minSdkVersion:21)
+androidx.compose.ui_ui-text(minSdkVersion:21)
+androidx.compose.ui_ui-text-android(minSdkVersion:21)
+androidx.compose.ui_ui-unit(minSdkVersion:21)
+androidx.compose.ui_ui-unit-android(minSdkVersion:21)
+androidx.compose.ui_ui-util(minSdkVersion:21)
+androidx.compose.ui_ui-util-android(minSdkVersion:21)
 androidx.concurrent_concurrent-futures(minSdkVersion:24)
 androidx.constraintlayout_constraintlayout-core(minSdkVersion:24)
 androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:19)
@@ -166,6 +201,7 @@ androidx.emoji2_emoji2-views-helper(minSdkVersion:19)
 androidx.exifinterface_exifinterface(minSdkVersion:19)
 androidx.fragment_fragment(minSdkVersion:19)
 androidx.fragment_fragment-ktx(minSdkVersion:19)
+androidx.graphics_graphics-path(minSdkVersion:21)
 androidx.interpolator_interpolator(minSdkVersion:19)
 androidx.javascriptengine_javascriptengine(minSdkVersion:26)
 androidx.leanback_leanback(minSdkVersion:19)
@@ -184,9 +220,11 @@ androidx.lifecycle_lifecycle-livedata-core(minSdkVersion:19)
 androidx.lifecycle_lifecycle-livedata-core-ktx(minSdkVersion:19)
 androidx.lifecycle_lifecycle-process(minSdkVersion:19)
 androidx.lifecycle_lifecycle-runtime(minSdkVersion:19)
+androidx.lifecycle_lifecycle-runtime-compose(minSdkVersion:21)
 androidx.lifecycle_lifecycle-runtime-ktx(minSdkVersion:19)
 androidx.lifecycle_lifecycle-service(minSdkVersion:19)
 androidx.lifecycle_lifecycle-viewmodel(minSdkVersion:19)
+androidx.lifecycle_lifecycle-viewmodel-compose(minSdkVersion:21)
 androidx.lifecycle_lifecycle-viewmodel-ktx(minSdkVersion:19)
 androidx.lifecycle_lifecycle-viewmodel-savedstate(minSdkVersion:19)
 androidx.loader_loader(minSdkVersion:19)
@@ -194,6 +232,7 @@ androidx.localbroadcastmanager_localbroadcastmanager(minSdkVersion:19)
 androidx.media_media(minSdkVersion:19)
 androidx.navigation_navigation-common(minSdkVersion:19)
 androidx.navigation_navigation-common-ktx(minSdkVersion:19)
+androidx.navigation_navigation-compose(minSdkVersion:21)
 androidx.navigation_navigation-fragment(minSdkVersion:19)
 androidx.navigation_navigation-fragment-ktx(minSdkVersion:19)
 androidx.navigation_navigation-runtime(minSdkVersion:19)
@@ -223,6 +262,11 @@ androidx.vectordrawable_vectordrawable-animated(minSdkVersion:19)
 androidx.versionedparcelable_versionedparcelable(minSdkVersion:19)
 androidx.viewpager2_viewpager2(minSdkVersion:19)
 androidx.viewpager_viewpager(minSdkVersion:19)
+androidx.wear.compose_compose-foundation(minSdkVersion:25)
+androidx.wear.compose_compose-material(minSdkVersion:25)
+androidx.wear.compose_compose-material-core(minSdkVersion:25)
+androidx.wear.compose_compose-navigation(minSdkVersion:25)
+androidx.wear_wear(minSdkVersion:23)
 androidx.webkit_webkit(minSdkVersion:19)
 androidx.window.extensions.core_core(minSdkVersion:19)
 androidx.window_window(minSdkVersion:19)
@@ -265,6 +309,8 @@ cellbroadcast-java-proto-lite(minSdkVersion:current)
 census(minSdkVersion:30)
 clatd(minSdkVersion:30)
 codecs_g711dec(minSdkVersion:29)
+com.android.media.audio-aconfig-cc(minSdkVersion:29)
+com.android.media.audioserver-aconfig-cc(minSdkVersion:29)
 com.android.vcard(minSdkVersion:9)
 com.google.android.material_material(minSdkVersion:19)
 com.uwb.support.aliro(minSdkVersion:30)
@@ -288,12 +334,14 @@ crtbegin_dynamic(minSdkVersion:16)
 crtbegin_dynamic(minSdkVersion:apex_inherit)
 crtbegin_dynamic1(minSdkVersion:apex_inherit)
 crtbegin_so(minSdkVersion:16)
+crtbegin_so(minSdkVersion:29)
 crtbegin_so(minSdkVersion:30)
 crtbegin_so(minSdkVersion:apex_inherit)
 crtbegin_so(minSdkVersion:current)
 crtbegin_so(minSdkVersion:VanillaIceCream)
 crtbegin_so1(minSdkVersion:apex_inherit)
 crtbrand(minSdkVersion:16)
+crtbrand(minSdkVersion:29)
 crtbrand(minSdkVersion:30)
 crtbrand(minSdkVersion:apex_inherit)
 crtbrand(minSdkVersion:current)
@@ -301,6 +349,7 @@ crtbrand(minSdkVersion:VanillaIceCream)
 crtend_android(minSdkVersion:16)
 crtend_android(minSdkVersion:apex_inherit)
 crtend_so(minSdkVersion:16)
+crtend_so(minSdkVersion:29)
 crtend_so(minSdkVersion:30)
 crtend_so(minSdkVersion:apex_inherit)
 crtend_so(minSdkVersion:current)
@@ -310,7 +359,8 @@ datastallprotosnano(minSdkVersion:29)
 dlmalloc(minSdkVersion:apex_inherit)
 dnsproxyd_protocol_headers(minSdkVersion:29)
 dnsproxyd_protocol_headers(minSdkVersion:30)
-DocumentsUI-res-lib(minSdkVersion:29)
+DocumentsUI-lib(minSdkVersion:29)
+DocumentsUIManifestLib(minSdkVersion:29)
 ethtool(minSdkVersion:30)
 exoplayer-annotation_stubs(minSdkVersion:19)
 exoplayer-media_apex(minSdkVersion:19)
@@ -321,6 +371,8 @@ ExtServices(minSdkVersion:30)
 ExtServices(minSdkVersion:current)
 ExtServices-core(minSdkVersion:30)
 ExtServices-core(minSdkVersion:current)
+ExtServices-tplus(minSdkVersion:30)
+ExtServices-tplus(minSdkVersion:current)
 flatbuffer_headers(minSdkVersion:(no version))
 flatbuffer_headers(minSdkVersion:apex_inherit)
 flatbuffers-java(minSdkVersion:30)
@@ -381,6 +433,7 @@ jsr330(minSdkVersion:current)
 kotlinx-coroutines-android(minSdkVersion:28)
 kotlinx-coroutines-android(minSdkVersion:current)
 kotlinx-coroutines-core(minSdkVersion:current)
+kotlinx-coroutines-core-jvm(minSdkVersion:28)
 kotlinx_atomicfu(minSdkVersion:current)
 kotlinx_coroutines(minSdkVersion:28)
 kotlinx_coroutines_android(minSdkVersion:28)
@@ -621,6 +674,7 @@ libgtest_prod(minSdkVersion:apex_inherit)
 libgtest_prod_headers(minSdkVersion:apex_inherit)
 libgui_bufferqueue_static(minSdkVersion:29)
 libgui_headers(minSdkVersion:29)
+libguiflags(minSdkVersion:29)
 libhardware(minSdkVersion:29)
 libhardware_headers(minSdkVersion:29)
 libhashbrown.rust_sysroot(minSdkVersion:29)
@@ -1039,6 +1093,7 @@ perfmark-stringfunction(minSdkVersion:30)
 perfmark-tag(minSdkVersion:30)
 PermissionController(minSdkVersion:28)
 PermissionController(minSdkVersion:30)
+permissioncontroller-protos(minSdkVersion:30)
 permissioncontroller-statsd(minSdkVersion:current)
 philox_random(minSdkVersion:(no version))
 philox_random(minSdkVersion:30)
@@ -1050,6 +1105,7 @@ prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:(no ver
 prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:19)
 prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:24)
 prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:current)
+prebuilt_androidx.activity_activity-compose-nodeps(minSdkVersion:21)
 prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.activity_activity-nodeps(minSdkVersion:(no version))
@@ -1084,6 +1140,37 @@ prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:24)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:30)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
+prebuilt_androidx.compose.animation_animation-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.animation_animation-core-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.animation_animation-core-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.animation_animation-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-layout-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-layout-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material3_material3-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material3_material3-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-icons-core-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-icons-core-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-ripple-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-ripple-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-livedata-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-saveable-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-saveable-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-geometry-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-geometry-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-graphics-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-graphics-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-text-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-text-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-unit-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-unit-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-util-android-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-util-nodeps(minSdkVersion:21)
 prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:24)
 prebuilt_androidx.constraintlayout_constraintlayout-core-nodeps(minSdkVersion:24)
 prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
@@ -1111,6 +1198,7 @@ prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:19)
+prebuilt_androidx.graphics_graphics-path-nodeps(minSdkVersion:21)
 prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:19)
 prebuilt_androidx.javascriptengine_javascriptengine-nodeps(minSdkVersion:26)
@@ -1141,12 +1229,14 @@ prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:(no version)
 prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:19)
 prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:19)
+prebuilt_androidx.lifecycle_lifecycle-runtime-compose-nodeps(minSdkVersion:21)
 prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:19)
 prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:19)
+prebuilt_androidx.lifecycle_lifecycle-viewmodel-compose-nodeps(minSdkVersion:21)
 prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.lifecycle_lifecycle-viewmodel-nodeps(minSdkVersion:(no version))
@@ -1163,6 +1253,7 @@ prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:(no vers
 prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:19)
+prebuilt_androidx.navigation_navigation-compose-nodeps(minSdkVersion:21)
 prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.navigation_navigation-fragment-nodeps(minSdkVersion:(no version))
@@ -1210,6 +1301,11 @@ prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:1
 prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:19)
 prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:19)
+prebuilt_androidx.wear.compose_compose-foundation-nodeps(minSdkVersion:25)
+prebuilt_androidx.wear.compose_compose-material-core-nodeps(minSdkVersion:25)
+prebuilt_androidx.wear.compose_compose-material-nodeps(minSdkVersion:25)
+prebuilt_androidx.wear.compose_compose-navigation-nodeps(minSdkVersion:25)
+prebuilt_androidx.wear_wear-nodeps(minSdkVersion:23)
 prebuilt_androidx.webkit_webkit-nodeps(minSdkVersion:19)
 prebuilt_androidx.window.extensions.core_core-nodeps(minSdkVersion:19)
 prebuilt_androidx.window_window-nodeps(minSdkVersion:19)
@@ -1233,20 +1329,22 @@ prebuilt_crtend_so(minSdkVersion:(no version))
 prebuilt_error_prone_annotations(minSdkVersion:(no version))
 prebuilt_error_prone_annotations(minSdkVersion:29)
 prebuilt_error_prone_annotations(minSdkVersion:current)
-prebuilt_firebase-common-aar(minSdkVersion:19)
-prebuilt_firebase-components-aar(minSdkVersion:19)
-prebuilt_firebase-datatransport-aar(minSdkVersion:19)
+prebuilt_firebase-common-aar(minSdkVersion:14)
+prebuilt_firebase-components-aar(minSdkVersion:14)
+prebuilt_firebase-datatransport-aar(minSdkVersion:14)
 prebuilt_firebase-encoders-jar(minSdkVersion:33)
-prebuilt_firebase-encoders-json-aar(minSdkVersion:19)
-prebuilt_firebase-iid-aar(minSdkVersion:19)
-prebuilt_firebase-iid-interop-aar(minSdkVersion:19)
-prebuilt_firebase-installations-aar(minSdkVersion:19)
-prebuilt_firebase-installations-interop-aar(minSdkVersion:19)
-prebuilt_firebase-measurement-connector-aar(minSdkVersion:19)
-prebuilt_firebase-messaging-aar(minSdkVersion:19)
+prebuilt_firebase-encoders-json-aar(minSdkVersion:14)
+prebuilt_firebase-iid-aar(minSdkVersion:14)
+prebuilt_firebase-iid-interop-aar(minSdkVersion:14)
+prebuilt_firebase-installations-aar(minSdkVersion:14)
+prebuilt_firebase-installations-interop-aar(minSdkVersion:14)
+prebuilt_firebase-measurement-connector-aar(minSdkVersion:14)
+prebuilt_firebase-messaging-aar(minSdkVersion:14)
 prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14)
 prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14)
 prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14)
+prebuilt_glide-integration-recyclerview-prebuilt(minSdkVersion:14)
+prebuilt_glide-integration-webpdecoder-prebuilt(minSdkVersion:14)
 prebuilt_glide-prebuilt(minSdkVersion:14)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current)
@@ -1293,6 +1391,7 @@ SettingsLibActivityEmbedding(minSdkVersion:21)
 SettingsLibAppPreference(minSdkVersion:21)
 SettingsLibBarChartPreference(minSdkVersion:21)
 SettingsLibCollapsingToolbarBaseActivity(minSdkVersion:29)
+SettingsLibColor(minSdkVersion:28)
 SettingsLibFooterPreference(minSdkVersion:21)
 SettingsLibHelpUtils(minSdkVersion:21)
 SettingsLibIllustrationPreference(minSdkVersion:28)
@@ -1304,6 +1403,7 @@ SettingsLibRadioButtonPreference(minSdkVersion:21)
 SettingsLibRestrictedLockUtils(minSdkVersion:21)
 SettingsLibSearchWidget(minSdkVersion:21)
 SettingsLibSelectorWithWidgetPreference(minSdkVersion:21)
+SettingsLibSettingsSpinner(minSdkVersion:21)
 SettingsLibSettingsTheme(minSdkVersion:21)
 SettingsLibSettingsTransition(minSdkVersion:29)
 SettingsLibTopIntroPreference(minSdkVersion:21)
@@ -1339,5 +1439,6 @@ uwb_androidx_backend(minSdkVersion:30)
 wifi-lite-protos(minSdkVersion:30)
 wifi-nano-protos(minSdkVersion:30)
 wifi-service-pre-jarjar(minSdkVersion:30)
+wifi_aconfig_flags_lib(minSdkVersion:30)
 xz-java(minSdkVersion:29)
 xz-java(minSdkVersion:current)
diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh
index 996ad2fc..028e3035 100755
--- a/build/build_unbundled_mainline_module.sh
+++ b/build/build_unbundled_mainline_module.sh
@@ -65,7 +65,7 @@ readonly -a DEFAULT_MODULES=(
   test_com.android.media.swcodec
   CaptivePortalLogin
   DocumentsUI
-  ExtServices
+  ExtServices-tplus
   NetworkStack
   NetworkStackNext
   PermissionController
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index 8a30da70..a9976df2 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -1049,6 +1049,14 @@ MAINLINE_MODULES = [
         for_r_build=None,
     ),
     MainlineModule(
+        apex="com.android.devicelock",
+        sdks=["devicelock-module-sdk"],
+        first_release=UpsideDownCake,
+        # Treat DeviceLock as optional at build time
+        # TODO(b/238203992): remove once all modules are optional at build time.
+        last_optional_release=LATEST,
+    ),
+    MainlineModule(
         apex="com.android.healthfitness",
         sdks=["healthfitness-module-sdk"],
         first_release=UpsideDownCake,
@@ -1079,6 +1087,10 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-mediaprovider"),
         ]),
+        # MP is a mandatory mainline module but in some cases (b/294190883) this
+        # needs to be optional for Android Go on T. GTS tests might be needed to
+        # to check the specific condition mentioned in the bug.
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.ondevicepersonalization",
diff --git a/javatests/com/android/modules/apkinapex/apex/Android.bp b/javatests/com/android/modules/apkinapex/apex/Android.bp
index c57280eb..44bea56d 100644
--- a/javatests/com/android/modules/apkinapex/apex/Android.bp
+++ b/javatests/com/android/modules/apkinapex/apex/Android.bp
@@ -34,6 +34,7 @@ apex_test {
     key: "test_com.android.modules.apkinapex.key",
     certificate: ":test_com.android.modules.apkinapex.certificate",
     updatable: false,
+    min_sdk_version: "33",
     apps: [
         "com.android.modules.apkinapex.apps.installable",
         "com.android.modules.apkinapex.apps.futureminsdk",
diff --git a/javatests/com/android/modules/apkinapex/apps/Android.bp b/javatests/com/android/modules/apkinapex/apps/Android.bp
index 04b56f29..0300955f 100644
--- a/javatests/com/android/modules/apkinapex/apps/Android.bp
+++ b/javatests/com/android/modules/apkinapex/apps/Android.bp
@@ -29,6 +29,7 @@ android_test_helper_app {
 
 android_test_helper_app {
     name: "com.android.modules.apkinapex.apps.futuretargetsdk",
+    min_sdk_version: "33",
     target_sdk_version: "Tiramisu",
     apex_available: [ "test_com.android.modules.apkinapex" ],
     manifest: "FutureTargetSdkAndroidManifest.xml"
@@ -36,6 +37,7 @@ android_test_helper_app {
 
 android_test_helper_app {
     name: "com.android.modules.apkinapex.apps.pastmaxsdk",
+    min_sdk_version: "29",
     target_sdk_version: "Tiramisu",
     apex_available: [ "test_com.android.modules.apkinapex" ],
     manifest: "PastMaxSdkAndroidManifest.xml"
diff --git a/javatests/com/android/modules/updatablesharedlibs/Android.bp b/javatests/com/android/modules/updatablesharedlibs/Android.bp
index 131366a1..9813dc85 100644
--- a/javatests/com/android/modules/updatablesharedlibs/Android.bp
+++ b/javatests/com/android/modules/updatablesharedlibs/Android.bp
@@ -41,6 +41,6 @@ java_test_host {
     ],
     test_suites: [
         "general-tests",
-        "mts-core",
+        "mts-mainline-infra",
     ],
 }
diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp
index 7eff4ec0..47ae7df0 100644
--- a/sdk/ModuleDefaults.bp
+++ b/sdk/ModuleDefaults.bp
@@ -45,6 +45,7 @@ java_defaults {
     // TODO(b/156126315) - Remove when no longer needed.
     api_lint: {
         enabled: true,
+        legacy_errors_allowed: false,
     },
 
     // The API scope specific properties.
@@ -60,9 +61,8 @@ java_defaults {
     // Configure framework module specific metalava options.
     droiddoc_options: [
         "--error UnhiddenSystemApi",
+        "--error UnflaggedApi",
         "--hide CallbackInterface",
-        "--hide HiddenTypedefConstant",
-        "--hide RequiresPermission",
         "--enhance-documentation",
     ],
 
@@ -172,7 +172,7 @@ filegroup_defaults {
 // These apex_defaults serve as a common place to add properties which should
 // affect all mainline modules.
 
-APEX_LOWEST_MIN_SDK_VERSION = "29"
+APEX_LOWEST_MIN_SDK_VERSION = "30"
 DCLA_MIN_SDK_VERSION = "31"
 
 apex_defaults {
@@ -184,7 +184,7 @@ apex_defaults {
 apex_defaults {
     name: "q-launched-apex-module",
     defaults: ["any-launched-apex-modules"],
-    min_sdk_version: "29",
+    min_sdk_version: APEX_LOWEST_MIN_SDK_VERSION,
     defaults_visibility: ["//visibility:public"],
 }
 
@@ -246,7 +246,6 @@ apex_defaults {
     name: "s-launched-apex-module",
     defaults: ["any-launched-apex-modules"],
     min_sdk_version: "31",
-    updatable: true,
     // Indicates that pre-installed version of this apex can be compressed.
     // Whether it actually will be compressed is controlled on per-device basis.
     compressible:true,