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

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

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



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