Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I7ecda01549aedee5b0ee524afc3a246c345bfaad
Change-Id: Ic35eacd07376233c754724451a19a440c54fc2d6

device-barbet.mk

diff --git a/device-barbet.mk b/device-barbet.mk
index 8382580..0e1d98b 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -16,6 +16,8 @@
 
 PRODUCT_HARDWARE := barbet
 
+USES_QCT_MODEM := true
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
     ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         LOCAL_KERNEL := device/google/redbull-kernel/Image.lz4
@@ -38,7 +40,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=60
+    ro.vendor.build.svn=62
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -227,3 +229,8 @@
 
 # Gyotaku
 include device/google/gs-common/gyotaku_app/gyotaku.mk
+# Better Bug
+include device/google/gs-common/betterbug/betterbug.mk
+
+# Set soong config variable to control module build
+$(call soong_config_set,ctpm,enable_nr_dual_connectivity_qcril,true)

factory-images/generate-factory-images-package.sh

diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index f25c2e0..f9a50fe 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -22,4 +22,5 @@
 SRCPREFIX=signed-
 BOOTLOADER=b9-0.4-6939415
 RADIO=g7250-00017-201029-B-6939687
+GSCFIRMWARESRC=citadel
 source ../../../common/generate-factory-images-common.sh

vibrator/OWNERS

diff --git a/vibrator/OWNERS b/vibrator/OWNERS
index 928c9ff..dec74a8 100644
--- a/vibrator/OWNERS
+++ b/vibrator/OWNERS
@@ -1,3 +1 @@
-chasewu@google.com
-eliptus@google.com
-michaelwr@google.com
+file:platform/hardware/google/pixel:/vibrator/OWNERS