Snap for 11296156 from 0837f63bfbfff993ef85ea5800ba23ce94eff9d7 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Ia8dbaf50e9fac452dc4b6f1b3b79cdb9951fab88

5 files changed, 39 insertions, 36 deletions

diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 6c23449c..3fb9c115 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -207,15 +207,11 @@ androidx.recyclerview_recyclerview-selection(minSdkVersion:19)
 androidx.resourceinspection_resourceinspection-annotation(minSdkVersion:24)
 androidx.room_room-common(minSdkVersion:24)
 androidx.room_room-ktx(minSdkVersion:19)
-androidx.room_room-ktx(minSdkVersion:19)
-androidx.room_room-runtime(minSdkVersion:19)
 androidx.room_room-runtime(minSdkVersion:19)
 androidx.savedstate_savedstate(minSdkVersion:19)
 androidx.savedstate_savedstate-ktx(minSdkVersion:19)
 androidx.slidingpanelayout_slidingpanelayout(minSdkVersion:19)
 androidx.sqlite_sqlite(minSdkVersion:19)
-androidx.sqlite_sqlite(minSdkVersion:19)
-androidx.sqlite_sqlite-framework(minSdkVersion:19)
 androidx.sqlite_sqlite-framework(minSdkVersion:19)
 androidx.startup_startup-runtime(minSdkVersion:19)
 androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:19)
@@ -230,7 +226,6 @@ androidx.webkit_webkit(minSdkVersion:19)
 androidx.window.extensions.core_core(minSdkVersion:19)
 androidx.window_window(minSdkVersion:19)
 androidx.work_work-runtime(minSdkVersion:19)
-androidx.work_work-runtime(minSdkVersion:19)
 apache-commons-compress(minSdkVersion:29)
 apache-commons-compress(minSdkVersion:current)
 apache-commons-io(minSdkVersion:33)
@@ -892,6 +887,7 @@ mobile-data-download-populator-java-proto-lite(minSdkVersion:30)
 mobile_data_downloader_lib(minSdkVersion:30)
 modules-utils-backgroundthread(minSdkVersion:29)
 modules-utils-binary-xml(minSdkVersion:29)
+modules-utils-binary-xml(minSdkVersion:31)
 modules-utils-build(minSdkVersion:29)
 modules-utils-build_system(minSdkVersion:29)
 modules-utils-bytesmatcher(minSdkVersion:29)
@@ -1181,8 +1177,6 @@ prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:19)
 prebuilt_androidx.resourceinspection_resourceinspection-annotation-nodeps(minSdkVersion:24)
 prebuilt_androidx.room_room-common-nodeps(minSdkVersion:24)
 prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:19)
-prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:19)
-prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:19)
 prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:19)
 prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:19)
 prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version))
@@ -1190,8 +1184,6 @@ prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:19)
 prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:19)
 prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:19)
-prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:19)
-prebuilt_androidx.sqlite_sqlite-nodeps(minSdkVersion:19)
 prebuilt_androidx.sqlite_sqlite-nodeps(minSdkVersion:19)
 prebuilt_androidx.startup_startup-runtime-nodeps(minSdkVersion:19)
 prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:(no version))
@@ -1212,7 +1204,6 @@ prebuilt_androidx.webkit_webkit-nodeps(minSdkVersion:19)
 prebuilt_androidx.window.extensions.core_core-nodeps(minSdkVersion:19)
 prebuilt_androidx.window_window-nodeps(minSdkVersion:19)
 prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:19)
-prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:19)
 prebuilt_asm-7.0(minSdkVersion:current)
 prebuilt_asm-9.2(minSdkVersion:current)
 prebuilt_asm-commons-7.0(minSdkVersion:current)
@@ -1242,12 +1233,12 @@ 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_glide-annotation-and-compiler-prebuilt(minSdkVersion:19)
-prebuilt_glide-disklrucache-prebuilt(minSdkVersion:19)
-prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:19)
-prebuilt_glide-integration-recyclerview-prebuilt(minSdkVersion:19)
-prebuilt_glide-integration-webpdecoder-prebuilt(minSdkVersion:19)
-prebuilt_glide-prebuilt(minSdkVersion:19)
+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)
 prebuilt_jni_headers(minSdkVersion:(no version))
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index 08b30cb6..86c6dcfd 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -1006,11 +1006,13 @@ MAINLINE_MODULES = [
         apex="com.android.adservices",
         sdks=["adservices-module-sdk"],
         first_release=Tiramisu,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.appsearch",
         sdks=["appsearch-sdk"],
         first_release=Tiramisu,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.art",
@@ -1037,6 +1039,7 @@ MAINLINE_MODULES = [
         apex="com.android.configinfrastructure",
         sdks=["configinfrastructure-sdk"],
         first_release=UpsideDownCake,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.conscrypt",
@@ -1050,11 +1053,13 @@ MAINLINE_MODULES = [
         # Conscrypt was updatable in R but the generate_ml_bundle.sh does not
         # appear to generate a snapshot for it.
         for_r_build=None,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.healthfitness",
         sdks=["healthfitness-module-sdk"],
         first_release=UpsideDownCake,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.ipsec",
@@ -1066,6 +1071,7 @@ MAINLINE_MODULES = [
                 shared_library=True,
             ),
         ]),
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.media",
@@ -1074,6 +1080,7 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-media"),
         ]),
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.mediaprovider",
@@ -1091,6 +1098,7 @@ MAINLINE_MODULES = [
         apex="com.android.ondevicepersonalization",
         sdks=["ondevicepersonalization-module-sdk"],
         first_release=Tiramisu,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.permission",
@@ -1119,6 +1127,7 @@ MAINLINE_MODULES = [
         apex="com.android.scheduling",
         sdks=["scheduling-sdk"],
         first_release=S,
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.sdkext",
@@ -1127,6 +1136,7 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-sdkextensions"),
         ]),
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.os.statsd",
@@ -1135,6 +1145,7 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-statsd"),
         ]),
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.tethering",
@@ -1143,6 +1154,7 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-tethering"),
         ]),
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.uwb",
diff --git a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
index d705ecb4..bc4c54c0 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
@@ -4,8 +4,8 @@
 soong_config_module_type {
     name: "ipsec_prebuilt_java_sdk_library_import",
     module_type: "java_sdk_library_import",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
+    config_namespace: "ipsec_module",
+    bool_variables: ["source_build"],
     properties: ["prefer"],
 }
 
@@ -13,8 +13,8 @@ soong_config_module_type {
 soong_config_module_type {
     name: "ipsec_prebuilt_prebuilt_bootclasspath_fragment",
     module_type: "prebuilt_bootclasspath_fragment",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
+    config_namespace: "ipsec_module",
+    bool_variables: ["source_build"],
     properties: ["prefer"],
 }
 
@@ -26,10 +26,10 @@ package {
 
 ipsec_prebuilt_prebuilt_bootclasspath_fragment {
     name: "com.android.ipsec-bootclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
@@ -48,10 +48,10 @@ ipsec_prebuilt_prebuilt_bootclasspath_fragment {
 
 ipsec_prebuilt_java_sdk_library_import {
     name: "android.net.ipsec.ike",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
index 2b844ab6..e8ba1b04 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
@@ -8,10 +8,10 @@ package {
 
 prebuilt_bootclasspath_fragment {
     name: "com.android.ipsec-bootclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+        config_namespace: "ipsec_module",
+        var_name: "source_build",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.ipsec"],
@@ -28,10 +28,10 @@ prebuilt_bootclasspath_fragment {
 
 java_sdk_library_import {
     name: "android.net.ipsec.ike",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+        config_namespace: "ipsec_module",
+        var_name: "source_build",
     },
     visibility: ["//visibility:public"],
     apex_available: [
diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
index 38025d4c..d33b2174 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
@@ -8,10 +8,10 @@ package {
 
 prebuilt_bootclasspath_fragment {
     name: "com.android.ipsec-bootclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+        config_namespace: "ipsec_module",
+        var_name: "source_build",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.ipsec"],
@@ -28,10 +28,10 @@ prebuilt_bootclasspath_fragment {
 
 java_sdk_library_import {
     name: "android.net.ipsec.ike",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
     use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+        config_namespace: "ipsec_module",
+        var_name: "source_build",
     },
     visibility: ["//visibility:public"],
     apex_available: [