Merge "Revert "Move tracing calls to libbinder_ndk"" into main am: 00e8bb88bc am: 880171a576

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

Change-Id: I822626da9fd569df25f8e0a4f26b8566a60f24ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>