Merge cherrypicks of ['googleplex-android-review.googlesource.com/22715061'] into sparse-9957400-L29100000960006895.

SPARSE_CHANGE: Ib646478150fe2e30136483757427c84f510e3e04

Change-Id: I4480da8f589210cef62146089cd7cfe5974c3e7a

device-lynx.mk

@@ -199,7 +199,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=6
+    ro.vendor.build.svn=85
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \