Merge "Revert^3 "Move tracing calls to libbinder_ndk"" into main am: 12f83cff40 am: 215d05acef

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

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