Merge cherrypicks of ['googleplex-android-review.googlesource.com/23229420'] into sparse-10161073-L38600000960763138.

SPARSE_CHANGE: I17d48910cd87583118621a76b81c8023c2dfd39d

Change-Id: I72296e593ad8d829be085d5f244155a1a2087827

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=7
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \