Snap for 8672689 from 4f910e51b4 to udc-release

Change-Id: I522a07ced1b197c66a6d7134da2c9765a145651c

device-lynx.mk

@@ -47,6 +47,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/lynx/media_profiles_lynx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
+# Display Config
+PRODUCT_COPY_FILES += \
+        device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
+
 # NFC
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
@@ -165,3 +169,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.zram.size=3g
+
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.support_hide_display_cutout=true
+
+# Hide cutout overlays
+PRODUCT_PACKAGES += \
+    NoCutoutOverlay \
+    AvoidAppsInCutoutOverlay

gps.xml.l10

@@ -49,8 +49,6 @@
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
 
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"

gps_user.xml.l10

@@ -48,8 +48,6 @@
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
 
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"