Merge cherrypicks of [12770580, 12770581] into rvc-d1-release

Change-Id: I67fd0e5f4638f75f3b167c19a3d29ea915a8e1be
diff --git a/device-common.mk b/device-common.mk
index 04db38e..8d5fc35 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -837,7 +837,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=1
+	ro.vendor.build.svn=4
 
 # ZRAM writeback
 PRODUCT_PROPERTY_OVERRIDES += \