Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE

Merged-In: Id8cf181d379f5dcfd070c1ee8470922e59d0974f
Merged-In: I437277a076021bb26dcc5c912d293c4fbe1c67b5
Change-Id: Ia111eb4fc4292872b24bcaa60f6ef762e57b0bf5
diff --git a/device-barbet.mk b/device-barbet.mk
index a201ef7..2c3fe7e 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -39,7 +39,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=21
+    ro.vendor.build.svn=23
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \