Merge SP1A.211105.004 to aosp-master - DO NOT MERGE

Merged-In: Ide7704360247495311ca5408af068bb6a4e655bc
Merged-In: I13edbe383b46f21229ff989e034e6c454f53611d
Change-Id: I5891e0d3c5c3ab8421ca7c39ac8ebff894d75025
diff --git a/device.mk b/device.mk
index 28cff09..d0fcfde 100644
--- a/device.mk
+++ b/device.mk
@@ -880,7 +880,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=31
+	ro.vendor.build.svn=35
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json