Merge "thermal: enable SendPowerHint of skin-therm-monitor" into rvc-d1-dev am: 2fc0bfbfcc am: 232d78072a

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bramble/+/12356472

Change-Id: Ifeb1074c2afbad89b10fec16237b3364e9dd2d11
diff --git a/aosp_bramble.mk b/aosp_bramble.mk
index 6ec72bd..f0aeaf2 100644
--- a/aosp_bramble.mk
+++ b/aosp_bramble.mk
@@ -21,8 +21,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
-# TODO(b/138706293): Enable mainline checking later
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
 
 #
 # All components inherited here go to system_ext image
@@ -50,6 +49,12 @@
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
+
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false
 
diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index 4b08457..bdd1176 100644
--- a/audio/acdbdata/Handset_cal.acdb
+++ b/audio/acdbdata/Handset_cal.acdb
Binary files differ