Merge aosp-main-future for b/319669529

Bug: 319669529
Merged-In: Ifab041d57a3ec2455d8d00fabaf3dccaedb6b934
Change-Id: I52312bc790b85ff11d337fb414bc735d0a50c56d
diff --git a/device-common.mk b/device-common.mk
index d2a32f3..6c10a12 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -706,8 +706,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
+ifeq ($(KEEP_VNDK),true)
 PRODUCT_PACKAGES += \
     vndk-sp
+endif
 
 # Override heap growth limit due to high display density on device
 PRODUCT_PROPERTY_OVERRIDES += \