Snap for 12605939 from ae2ed690b9 to mainline-tzdata6-release

Change-Id: Ia899a53b271e8398db071b08f635a6bef0b8fda8

conf/init.lynx.rc

@@ -16,7 +16,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_lynx
 
-service insmod_sh_lynx /vendor/bin/insmod.sh /vendor/etc/init.insmod.lynx.cfg
+service insmod_sh_lynx /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.lynx.cfg
     class main
     user root
     group root system

device-lynx.mk

@@ -46,9 +46,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.lynx.cfg
+	device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.lynx.cfg
+endif
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -86,6 +90,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayLynx
 
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \

nfc/libnfc-hal-st.conf

@@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86}
 # host  0x00
 # eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
 # UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
+DEFAULT_ISODEP_ROUTE=0x00
 
 ###############################################################################
 # Configure the HAL Clock control

powerhint.json

@@ -1048,6 +1048,18 @@
       "Duration": 100,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
       "Node": "TAPreferHighCap",