Merge "[sf] Clean up transaction handling trace tags" into udc-dev am: c22a33e1 am: 84882618

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



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