Merge cherrypicks of ['googleplex-android-review.googlesource.com/26748680', 'googleplex-android-review.googlesource.com/26822100'] into 24Q2-release.

Change-Id: Iea72b0fce3e3515b69afa46362e65e9e085ccb9b

device-lynx.mk

@@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=39
+    ro.vendor.build.svn=41
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \