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

Change-Id: I96bde3102906110b68c9fed63f74e28b9454cc24
diff --git a/device-felix.mk b/device-felix.mk
index bc7189e..b11d813 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=48
+    ro.vendor.build.svn=50
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\