Merge Android 14 QPR3 to AOSP main

Bug: 346855327
Merged-In: I3c0a334d7b9ea7f69adc58c1843fb49be67b749a
Change-Id: Ief9b0746889aa7774089f7febc29244fd0c50ca1

device-barbet.mk

diff --git a/device-barbet.mk b/device-barbet.mk
index 5a426d7..8382580 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -38,7 +38,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=52
+    ro.vendor.build.svn=60
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -224,3 +224,6 @@
 
 PRODUCT_PACKAGES += \
     NfcOverlayBarbet
+
+# Gyotaku
+include device/google/gs-common/gyotaku_app/gyotaku.mk