Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: Id4b51c7ad05e4bbbc50845c4c2df303704f7d979
Change-Id: I1b45cfe9622ae9396dc5e59318e2e217255ad84b
diff --git a/Android.bp b/Android.bp
index 73f602d..2a9d5d9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,7 @@
         "com.android.resolv",
         "com.android.uwb",
     ],
+    vendor_available: true,
     min_sdk_version: "29",
 }
 
diff --git a/cargo2android.json b/cargo2android.json
index edcfcb0..7b3f179 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,5 +10,6 @@
   "features": "os-poll,tcp,udp,uds,os-util",
   "min-sdk-version": "29",
   "run": true,
+  "vendor-available": true,
   "tests": true
 }