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

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



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