Merge cherrypicks of ['googleplex-android-review.googlesource.com/24643464'] into udc-release.
Change-Id: Idf930fef4869c6f5ebae3f28382da85f3545eb9b
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index c6b12dc..8cbeaa0 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "10368779"
+ build_id: "10753134"
target: "mainline_modules_sdks-user"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.btservices/sdk/btservices-module-sdk-current.zip"
}
diff --git a/current/Android.bp b/current/Android.bp
index 5f800ca..e9487f6 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,11 @@
// This is auto-generated. DO NOT EDIT.
+// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
+// to support coexistence.
+blueprint_package_includes {
+ match_all: ["com.android.mainline"]
+}
+
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index cabbe8c..21514af 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10368779
\ No newline at end of file
+10753134
\ No newline at end of file
