Merge "Disable aidl tag tracing in libbinder_aidl_test_stub" am: d19445d9df am: 4335e593a3 am: 5dcf13037d am: e760e8c183 am: 9cd75444bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2206877

Change-Id: If4b915d722f827096e186b8f1a126a58fdb14430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 246963a..2b88852 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -480,6 +480,9 @@
         java: {
             enabled: false,
         },
+        cpp: {
+            gen_trace: false,
+        },
     },
 }