Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE

Merged-In: Ia874d0f760f54a96b1f4280a883251374910037c
Merged-In: I07404eaff792548d83461fa34837123d95808094

Change-Id: Ie6e414cd89b69050a1634cce04f4070f707832a4
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