Merge "Revert^2 "Move tracing calls to libbinder_ndk"" into main am: a4d6e515

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



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