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

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



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