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

Change-Id: I1b33791d16ab52521cea50e9946dc53d1550a8cd
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9731811..f1bfde7 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -147,7 +147,7 @@
 TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 64
+TARGET_SVN ?= 65
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \