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: 92db9908 am: 6603f935

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



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