Merge cherrypicks of ['googleplex-android-review.googlesource.com/27584896', 'googleplex-android-review.googlesource.com/27585950', 'googleplex-android-review.googlesource.com/26823303', 'googleplex-android-review.googlesource.com/28295845', 'googleplex-android-review.googlesource.com/28295692'] into 24Q3-release.

Change-Id: Ibeaf742498a91fcdd2e4121df66059ab4de5bd86
diff --git a/device-oriole.mk b/device-oriole.mk
index f72aefe..7de385a 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -193,8 +193,15 @@
 endif
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_ORIOLE
+TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 85
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=83
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index a14a304..03b3b44 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -197,8 +197,15 @@
 endif
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_RAVEN
+TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 85
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=83
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \