Snap for 7945036 from a070495f1b to tm-release

Change-Id: I10e71f36f3a5b7384669058902cb39bbabb89ddd

bluejay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -53,6 +53,14 @@
         <item>0</item> <!-- 4: SUN -->
     </integer-array>
 
+    <!-- Haptic feedback intensity for ticks used for the udfps dwell time -->
+    <item name="config_udfpsTickIntensity" translatable="false" format="float"
+          type="dimen">.3</item>
+
+    <!-- Haptic feedback tick type - if true, uses VibrationEffect.Composition.PRIMITIVE_LOW_TICK
+         else uses VibrationEffect.Composition.PRIMITIVE_TICK -->
+    <bool name="config_udfpsUseLowTick">false</bool>
+
     <!-- Default rounded corner curve (a Bezier). Must match (the curved path in) rounded.xml.
          Note that while rounded.xml includes the entire path (including the horizontal and vertical
          corner edges), this pulls out just the curve.

device-bluejay.mk

@@ -66,7 +66,8 @@ PRODUCT_COPY_FILES += \
 
 # Display Config
 PRODUCT_COPY_FILES += \
-        device/google/bluejay/bluejay/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
+	device/google/bluejay/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
+	device/google/bluejay/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb
 
 # NFC
 PRODUCT_COPY_FILES += \