Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Iddcfb2eee234bbbdb2a3d31dd2ce11fdf763094c
Change-Id: I98b26a17067040eabf962953abee741973f7ac01
diff --git a/aosp_oriole.mk b/aosp_oriole.mk
index fea2be8..113f679 100644
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -22,3 +22,5 @@
 PRODUCT_MODEL := AOSP on Oriole
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/aosp_raven.mk b/aosp_raven.mk
index 0a8f525..079de8a 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -22,3 +22,5 @@
 PRODUCT_MODEL := AOSP on Raven
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor