Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177037', 'googleplex-android-review.googlesource.com/25062409', 'googleplex-android-review.googlesource.com/25169439'] into udc-qpr1-release.

Change-Id: I492f9f5c26e65a139a632dd3c9aef9bbdd82e121

device-lynx.mk

@@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=20
+    ro.vendor.build.svn=22
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -283,3 +283,8 @@ PRODUCT_PACKAGES += \
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+# Quick Start device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.quick_start.oem_id=00e0 \
+    ro.quick_start.device_id=lynx