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

SPARSE_CHANGE: I17d48910cd87583118621a76b81c8023c2dfd39d

Change-Id: I8a4001cc7c4898ed50ae0fd0e62b4eec9364b219

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 += \