Merge cherrypicks of [19460690, 19458611] into tm-release.

Change-Id: Iba1050ba974e7df88f5c05e44fe6fcb983ac39a8
diff --git a/device-oriole.mk b/device-oriole.mk
index b652ae5..5302e26 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -168,7 +168,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=36
+    ro.vendor.build.svn=37
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 09900d8..d63decc 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -178,7 +178,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=36
+    ro.vendor.build.svn=37
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \