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

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



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