Merge cherrypicks of ['googleplex-android-review.googlesource.com/27586565', 'googleplex-android-review.googlesource.com/26824327', 'googleplex-android-review.googlesource.com/28319740'] into 24Q3-release.

Change-Id: I77bc9ca4e35a5e448570c5de0e83ea05f4774702

device-lynx.mk

@@ -211,8 +211,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 	vendor.zram.size=3g
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_LYNX
+TARGET_SVN ?= $(RELEASE_SVN_LYNX)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 45
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=43
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \