Merge cherrypicks of ['googleplex-android-review.googlesource.com/26245621', 'googleplex-android-review.googlesource.com/26247218', 'googleplex-android-review.googlesource.com/26247756', 'googleplex-android-review.googlesource.com/26463011', 'googleplex-android-review.googlesource.com/26666719'] into 24Q2-release.

Change-Id: If33004cbe8ac0811f6809339785a04c3dbec612b
diff --git a/device-felix.mk b/device-felix.mk
index 1166a1f..bc7189e 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -220,7 +220,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=43
+    ro.vendor.build.svn=48
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\