[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12470406

Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1
diff --git a/Android.bp b/Android.bp
index 593dd27..4852fe4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -89,7 +89,7 @@
         export_aidl_headers: true,
     },
     whole_static_libs: [
-        "libincremental_aidl-cpp",
+        "libincremental_aidl-unstable-cpp",
     ],
 }