Merge SP2A.220405.004 to aosp-master - DO NOT MERGE

Merged-In: I0b367368946f7147acf241c5a88b8f31e4ba7f13
Merged-In: If7ae2cfd8e8ebaacf0154328c0fe5fa9b90d2355
Change-Id: Icb8a72b0fd537c913b4f6fc48ee9aec6f5f844d5
diff --git a/device-oriole.mk b/device-oriole.mk
index 54280e7..355fd42 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=22
+    ro.vendor.build.svn=24
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 213db30..dd88261 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -183,7 +183,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=22
+    ro.vendor.build.svn=24
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \