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

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



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