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

Change-Id: I96a183b3fead5040bbeb95e6dcecf1451436743a
diff --git a/device-felix.mk b/device-felix.mk
index 12a7ab2..3a224b8 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -211,7 +211,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=46
+    ro.vendor.build.svn=48
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\