Merge "Track transaction merges through transaction trace" into udc-dev am:...

Merge "Track transaction merges through transaction trace" into udc-dev am: addae5a2 am: b5284f57

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



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