Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I085b9bae6ea33c255634fe4406b41bf9f3502efe
diff --git a/OWNERS b/OWNERS
index 7eed0c3..5524a1f 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
per-file powerhint.json = [email protected],[email protected],[email protected],[email protected]
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 921f758..cf444ea 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -283,3 +283,6 @@
PRODUCT_PRODUCT_PROPERTIES += \
ro.quick_start.oem_id=00e0 \
ro.quick_start.device_id=bluejay
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
