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

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



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