Snap for 12058995 from 1744a12bc4 to 24Q4-release

Change-Id: I2198d5a2e5a8c669dada13f7cd6181e1ad2b7268

device.mk

@@ -82,7 +82,6 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_devices/common/chre/host/hal \
 	vendor/google/whitechapel/tools \
 	vendor/google/interfaces \
-	vendor/google_devices/common/proprietary/confirmatioui_hal \
 	vendor/google_nos/host/android \
 	vendor/google_nos/test/system-test-harness \
 	vendor/google/camera
@@ -95,6 +94,11 @@ TRUSTY_KEYMINT_IMPL := rust
 ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
 	# Set the environment variable to enable the Secretkeeper HAL service.
 	SECRETKEEPER_ENABLED := true
+	# TODO(b/341708664): Enable Secretkeeper unconditionally once AOSP targets are built with
+	# compatible bootloader (24Q3+).
+	ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+		SECRETKEEPER_ENABLED := false
+	endif
 endif
 
 # OEM Unlock reporting
@@ -864,8 +868,6 @@ PRODUCT_PACKAGES_DEBUG += \
    trusty_stats_test \
    trusty-coverage-controller \
 
-include device/google/gs101/confirmationui/confirmationui.mk
-
 # Trusty Metrics Daemon
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/trusty/common