Merge "Revert^3 "Move tracing calls to libbinder_ndk"" into main am: 12f83cff

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



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