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

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

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