Merge "Bring back Binder atrace symbols" into main am: 9c6c64363b am: 81b40a02b2

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

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