Snap for 10066519 from 518ab92232e4839a42f204f88e7f07c37d0f6e6c to mainline-networking-releaseaml_net_331910030

Change-Id: I331edaf365891c9a733da376d3da4c5ae18bcf7c

2 files changed, 14 insertions, 0 deletions

diff --git a/PREBUILTS_MODULE_OWNERS b/PREBUILTS_MODULE_OWNERS
index 5a2efe33..e7b76ba4 100644
--- a/PREBUILTS_MODULE_OWNERS
+++ b/PREBUILTS_MODULE_OWNERS
@@ -12,3 +12,4 @@
 include platform/packages/modules/common:/MODULES_OWNERS
 aseaton@google.com #{LAST_RESORT_SUGGESTION}
 dariofreni@google.com #{LAST_RESORT_SUGGESTION}
+paulduffin@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index cc7aaf15..d7853cae 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -125,6 +125,8 @@ androidx.annotation_annotation-experimental(minSdkVersion:14)
 androidx.annotation_annotation-jvm(minSdkVersion:24)
 androidx.appcompat_appcompat(minSdkVersion:14)
 androidx.appcompat_appcompat-resources(minSdkVersion:14)
+androidx.appsearch_appsearch(minSdkVersion:14)
+androidx.appsearch_appsearch-platform-storage(minSdkVersion:14)
 androidx.arch.core_core-common(minSdkVersion:24)
 androidx.arch.core_core-runtime(minSdkVersion:14)
 androidx.asynclayoutinflater_asynclayoutinflater(minSdkVersion:14)
@@ -190,6 +192,7 @@ androidx.recyclerview_recyclerview(minSdkVersion:14)
 androidx.recyclerview_recyclerview-selection(minSdkVersion:14)
 androidx.resourceinspection_resourceinspection-annotation(minSdkVersion:24)
 androidx.room_room-common(minSdkVersion:24)
+androidx.room_room-ktx(minSdkVersion:14)
 androidx.room_room-runtime(minSdkVersion:14)
 androidx.savedstate_savedstate(minSdkVersion:14)
 androidx.savedstate_savedstate-ktx(minSdkVersion:14)
@@ -234,6 +237,7 @@ brotli-java(minSdkVersion:29)
 brotli-java(minSdkVersion:current)
 captiveportal-lib(minSdkVersion:29)
 car-rotary-lib(minSdkVersion:28)
+car-rotary-lib-overlayable-resources(minSdkVersion:28)
 car-rotary-lib-resources(minSdkVersion:28)
 car-ui-lib(minSdkVersion:28)
 car-ui-lib-overlayable-resources(minSdkVersion:28)
@@ -361,6 +365,7 @@ libaudioclient_aidl_conversion_util(minSdkVersion:29)
 libaudioclient_headers(minSdkVersion:29)
 libaudiofoundation_headers(minSdkVersion:29)
 libaudioutils(minSdkVersion:29)
+libaudioutils_fastmath(minSdkVersion:29)
 libaudioutils_fixedfft(minSdkVersion:29)
 libavcdec(minSdkVersion:29)
 libavcenc(minSdkVersion:29)
@@ -667,6 +672,7 @@ libprotobuf-cpp-lite-ndk(minSdkVersion:33)
 libprotobuf-java-lite(minSdkVersion:current)
 libprotobuf-java-micro(minSdkVersion:8)
 libprotobuf-java-nano(minSdkVersion:9)
+libprotobuf_deprecated(minSdkVersion:29)
 libprotoutil(minSdkVersion:(no version))
 libprotoutil(minSdkVersion:30)
 libqemu_pipe(minSdkVersion:(no version))
@@ -857,6 +863,7 @@ networkstack-aidl-interfaces-V13-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V14-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V15-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V16-java(minSdkVersion:29)
+networkstack-aidl-interfaces-V17-java(minSdkVersion:29)
 networkstack-aidl-latest(minSdkVersion:29)
 networkstack-client(minSdkVersion:29)
 NetworkStackApi29Shims(minSdkVersion:29)
@@ -864,9 +871,11 @@ NetworkStackApi30Shims(minSdkVersion:29)
 NetworkStackApi31Shims(minSdkVersion:29)
 NetworkStackApi33Shims(minSdkVersion:29)
 NetworkStackApi34Shims(minSdkVersion:29)
+NetworkStackApiCurrentLib(minSdkVersion:29)
 NetworkStackApiCurrentShims(minSdkVersion:29)
 NetworkStackApiStableLib(minSdkVersion:29)
 NetworkStackApiStableShims(minSdkVersion:29)
+NetworkStackNextManifestBase(minSdkVersion:29)
 networkstackprotos(minSdkVersion:29)
 NetworkStackShimsCommon(minSdkVersion:29)
 neuralnetworks_supportlibrary_loader(minSdkVersion:29)
@@ -888,6 +897,7 @@ opencensus-java-api(minSdkVersion:current)
 opencensus-java-contrib-grpc-metrics(minSdkVersion:33)
 opencensus-java-contrib-grpc-metrics(minSdkVersion:current)
 OsuLoginGoogle(minSdkVersion:30)
+owasp-java-encoder(minSdkVersion:33)
 perfetto_trace_protos(minSdkVersion:S)
 PermissionController(minSdkVersion:28)
 PermissionController(minSdkVersion:30)
@@ -916,6 +926,8 @@ prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:14)
 prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:14)
+prebuilt_androidx.appsearch_appsearch-nodeps(minSdkVersion:14)
+prebuilt_androidx.appsearch_appsearch-platform-storage-nodeps(minSdkVersion:14)
 prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:24)
 prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:30)
 prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:current)
@@ -1036,6 +1048,7 @@ prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:(no v
 prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:14)
 prebuilt_androidx.resourceinspection_resourceinspection-annotation-nodeps(minSdkVersion:24)
 prebuilt_androidx.room_room-common-nodeps(minSdkVersion:24)
+prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:14)
 prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:14)
 prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:14)
 prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version))