Merge "Unify binder txn trace name" am: 47050bb8 am: ab6871e7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660



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