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

Merge "Track transaction merges through transaction trace" into udc-dev am: addae5a2 am: 42e4a5e7 am: d7549836 am: 77f2ab8b

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



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