Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: If77ab7c5e9ceee4f4fbbb29d49d7d156a643ebea
Change-Id: I00dd65e6a819849c3502bd0e20a1ddc3a9d97adf
diff --git a/Android.bp b/Android.bp
index 444ea9f..cd451c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -36,4 +36,9 @@
         "libbytes",
         "libmemchr",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.uwb",
+    ],
+    min_sdk_version: "29",
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..8d76784
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.uwb"
+  ],
+  "device": true,
+  "min_sdk_version": "29",
+  "run": true
+}
\ No newline at end of file