Merge "Expose transaction id" into tm-qpr-dev am: d951dd2b26 am: f7ff793c54

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

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